Return-Path: 
 <commits-return-30280-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 BCD2C1079C
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Tue, 27 Aug 2013 08:48:25 +0000 (UTC)
Received: (qmail 14892 invoked by uid 500); 27 Aug 2013 08:48:23 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 14870 invoked by uid 500); 27 Aug 2013 08:48:22 -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 14863 invoked by uid 99); 27 Aug 2013 08:48:21 -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, 27 Aug 2013 08:48:21 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 19A7D1EB5C; Tue, 27 Aug 2013 08:48:21 +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: <8fc1f85b85a948f1b208f21103ed2e03@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: git commit: updated refs/heads/master to 6fc98a8
Date: Tue, 27 Aug 2013 08:48:21 +0000 (UTC)

Updated Branches:
  refs/heads/master fab318518 -> 6fc98a845


CLOUDSTACK-772 review comments on DVS fixed


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

Branch: refs/heads/master
Commit: 6fc98a84511574da9db82167cd350447e7e67367
Parents: fab3185
Author: radhikap <radhika.puthiyetath@citrix.com>
Authored: Tue Aug 27 14:17:15 2013 +0530
Committer: radhikap <radhika.puthiyetath@citrix.com>
Committed: Tue Aug 27 14:17:43 2013 +0530

----------------------------------------------------------------------
 docs/en-US/vmware-cluster-config-dvswitch.xml | 57 ++++++++++++++--------
 1 file changed, 36 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fc98a84/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 a49a1a5..311673a 100644
--- a/docs/en-US/vmware-cluster-config-dvswitch.xml
+++ b/docs/en-US/vmware-cluster-config-dvswitch.xml
@@ -78,8 +78,16 @@
     <para>Use this VDS name when you specify the switch name in the traffic label while creating the
       zone. Traffic label format is [["Name of vSwitch/dvSwitch/EthernetPortProfile"][,"VLAN
       ID"[,"vSwitch Type"]]]</para>
-    <para>possible values for networkLabel, "" (empty string) dvSwitch0 dvSwitch0,200
-      dvSwitch0,300,vmwaredvs myEthernetPortProfile,,nexusdvs dvSwitch0,,vmwaredvs</para>
+    <para>The possible values for traffic labels are:</para>
+    <itemizedlist>
+      <listitem><para>empty string</para></listitem>
+      <listitem><para>dvSwitch0</para></listitem>
+      <listitem><para> dvSwitch0,200</para></listitem>
+      <listitem><para>dvSwitch1,300,vmwaredvs</para></listitem>
+      <listitem><para>myEthernetPortProfile,,nexusdvs</para></listitem>
+      <listitem><para>dvSwitch0,,vmwaredvs</para></listitem>
+    </itemizedlist>
+    
     <mediaobject>
       <imageobject>
         <imagedata fileref="./images/traffic-label.png"/>
@@ -105,15 +113,17 @@
             <entry><para>1</para></entry>
             <entry><para>Represents the name of the virtual / distributed virtual switch at
                 vCenter.</para></entry>
-            <entry><para>The default value assumed would depend upon the type of virtual switch.
-                Defaults values are as follows. vSwitch0 if type of virtual switch is "VMware
-                vNetwork Standard virtual switch" dvSwitch0 if type of virtual switch is "VMware
-                vNetwork distributed virtual switch" epp0 if type of virtual switch is "Cisco Nexus
-                1000v distributed virtual switch</para></entry>
+            <entry><para>The default value depends on the type of virtual switch:</para>
+              <para><emphasis role="bold">vSwitch0</emphasis>: If type of virtual switch is VMware
+                vNetwork Standard virtual switch </para>
+              <para><emphasis role="bold">dvSwitch0</emphasis>: If type of virtual switch is VMware
+                vNetwork Distributed virtual switch</para>
+              <para><emphasis role="bold">epp0</emphasis>: If type of virtual switch is Cisco Nexus
+                1000v Distributed virtual switch</para></entry>
           </row>
           <row>
             <entry><para>2</para></entry>
-            <entry><para>VLAN ID to be used for this traffic where ever applicable</para></entry>
+            <entry><para>VLAN ID to be used for this traffic wherever applicable.</para></entry>
             <entry><para>This field would be used for only public traffic as of now. In case of guest traffic this
                 field would be ignored and could be left empty for guest traffic. By default empty
                 string would be assumed which translates to untagged VLAN for that specific traffic
@@ -121,19 +131,24 @@
           </row>
           <row>
             <entry><para>3</para></entry>
-            <entry><para>Type of virtual switch specified as string</para></entry>
-            <entry><para>Possible valid values are vmwaredvs, vmwaresvs, nexusdvs. Each translates as follows.
-                "vmwaresvs" represents "VMware vNetwork Standard virtual switch" "vmwaredvs"
-                represents "VMware vNetwork distributed virtual switch" "nexusdvs" represents "Cisco
-                Nexus 1000v distributed virtual switch" If nothing is specified (left empty) that
-                means zone level default virtual switch (based on value of global parameters) would
-                be assumed. Following are the global configuration parameters. vmware.use.dvswitch -
-                This should be true to enable any kind (VMware DVS / Cisco Nexus 1000v DVS) of
-                distributed virtual switch in cloudstack deployment. If this is false that means
-                default virtual switch in that cloudstack deployment is "standard virtual switch"
-                only. vmware.use.nexus.vswitch - This parameter would be ignored unless
-                "vmware.use.dvswitch" is true. Set this to "true" to enable Cisco Nexus 1000v
-                distributed virtual switch in a cloudstack deployment.</para></entry>
+            <entry><para>Type of virtual switch. Specified as string.</para></entry>
+            <entry><para>Possible valid values are vmwaredvs, vmwaresvs, nexusdvs. </para>
+              <para><emphasis role="bold">vmwaresvs</emphasis>: Represents VMware vNetwork Standard
+                virtual switch</para>
+              <para><emphasis role="bold">vmwaredvs</emphasis>: Represents VMware vNetwork
+                distributed virtual switch</para>
+              <para><emphasis role="bold">nexusdvs</emphasis>: Represents Cisco Nexus 1000v
+                distributed virtual switch.</para>
+              <para>If nothing specified (left empty), zone-level default virtual switch would be
+                defaulted, based on the value of global parameter you specify. </para>
+              <para>Following are the global configuration parameters:</para>
+              <para><emphasis role="bold">vmware.use.dvswitch</emphasis>: Set to true to enable any
+                kind (VMware DVS and Cisco Nexus 1000v) of distributed virtual switch in a &PRODUCT;
+                deployment. If set to false, the virtual switch that can be used in that &PRODUCT;
+                deployment is Standard virtual switch. </para>
+              <para><emphasis role="bold">vmware.use.nexus.vswitch</emphasis>: This parameter is
+                ignored if vmware.use.dvswitch is set to false. Set to true to enable Cisco Nexus
+                1000v distributed virtual switch in a &PRODUCT; deployment.</para></entry>
           </row>
         </tbody>
       </tgroup>