Return-Path: 
 <commits-return-16208-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
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 35C13FFC8
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Wed, 10 Apr 2013 17:45:59 +0000 (UTC)
Received: (qmail 68867 invoked by uid 500); 10 Apr 2013 17:45:44 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 68826 invoked by uid 500); 10 Apr 2013 17:45:44 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 68295 invoked by uid 99); 10 Apr 2013 17:45:43 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2013 17:45:43 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 40AF8818C86; Wed, 10 Apr 2013 17:45:43 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bfederle@apache.org
To: commits@cloudstack.apache.org
Date: Wed, 10 Apr 2013 17:46:30 -0000
Message-Id: <5db4392b15884c9795c14a2ea63b78f0@git.apache.org>
In-Reply-To: <1238857236144e60bc193bb611984a1d@git.apache.org>
References: <1238857236144e60bc193bb611984a1d@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [50/50] [abbrv] git commit: updated
 refs/heads/ui-mixed-zone-management to 7efbcfa

CLOUDSTACK-772


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

Branch: refs/heads/ui-mixed-zone-management
Commit: 7efbcfa9bf721c105436cd11171c5095efbc39e6
Parents: a4a129e
Author: radhikap <radhika.puthiyetath@citrix.com>
Authored: Wed Apr 10 22:02:22 2013 +0530
Committer: radhikap <radhika.puthiyetath@citrix.com>
Committed: Wed Apr 10 22:02:57 2013 +0530

----------------------------------------------------------------------
 docs/en-US/vmware-cluster-config-dvswitch.xml |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7efbcfa9/docs/en-US/vmware-cluster-config-dvswitch.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/vmware-cluster-config-dvswitch.xml b/docs/en-US/vmware-cluster-config-dvswitch.xml
index dfbaca1..3468c1b 100644
--- a/docs/en-US/vmware-cluster-config-dvswitch.xml
+++ b/docs/en-US/vmware-cluster-config-dvswitch.xml
@@ -65,7 +65,7 @@
       Additionally, &PRODUCT; uses VDS for virtual network infrastructure if the value of
       vmware.use.dvswitch parameter is true and the value of vmware.use.nexus.dvswitch parameter is
       false.</para>
-    <para>&PRODUCT; supports configuring virtual networks in a deployment with a mix of Virtual
+    <para>&PRODUCT; supports orchestration of virtual networks in a deployment with a mix of Virtual
       Distributed Switch, Standard Virtual Switch and Nexus 1000v Virtual Switch. </para>
   </section>
   <section id="config-dvswitch">
@@ -101,8 +101,8 @@
           </row>
           <row>
             <entry><para>vCenter Host</para></entry>
-            <entry><para>Enter the host name or the IP address of the vCenter host where you have
-                deployed the Nexus virtual switch.</para></entry>
+            <entry><para>Enter the name or the IP address of the vCenter host where you have deployed the VMware
+                VDS.</para></entry>
           </row>
           <row>
             <entry><para>vCenter User name</para></entry>
@@ -132,7 +132,7 @@
           </row>
           <row>
             <entry><para>Public Traffic vSwitch Name</para></entry>
-            <entry><para>Specify a name to identify the switch.</para></entry>
+            <entry><para>Name of virtual switch to be used for the public traffic.</para></entry>
           </row>
           <row>
             <entry><para>Override Guest Traffic</para></entry>
@@ -148,18 +148,18 @@
           </row>
           <row>
             <entry><para>Guest Traffic vSwitch Name</para></entry>
-            <entry><para>Specify a name to identify the switch.</para></entry>
+            <entry><para>Name of virtual switch to be used for guest traffic.</para></entry>
           </row>
         </tbody>
       </tgroup>
     </informaltable>
   </section>
   <section id="vmware-dvswitch-remove">
-    <title>Removing Nexus Virtual Switch</title>
+    <title>Removing VMware Virtual Switch</title>
     <orderedlist>
       <listitem>
-        <para>In the vCenter datacenter that is served by the VMware dvSwitch, ensure that you
-          delete all the hosts in the corresponding cluster.</para>
+        <para>In the vCenter datacenter that is served by the VDS, ensure that you delete all the
+          hosts in the corresponding cluster.</para>
       </listitem>
       <listitem>
         <para>Log in with Admin permissions to the &PRODUCT; administrator UI.</para>