From 8ab112122148dc333f072aaafe2891fb01cde058 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Mon, 22 Nov 2010 12:33:59 -0800
Subject: [PATCH] merge 7266: Added description for basic and advanced
 networking options while adding a new zone.

---
 ui/jsp/resource.jsp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp
index 5939e49d4cf..3a9620ab625 100644
--- a/ui/jsp/resource.jsp
+++ b/ui/jsp/resource.jsp
@@ -116,7 +116,7 @@
                     <h2>
                         Step 1: <strong>Select a Network</strong></h2>
                     <p>
-                        Please select a Network for your new zone. 
+                        Please select a network model for your zone.
                     </p>
                 </div>
                 <div class="zonepopup_contentpanel">
@@ -131,7 +131,7 @@
                                 </div>
                                 <div class="zonepopup_selectiondescriptionbox_bot">
                                     <p>
-                                        Create VLAN when adding a pod    
+                                        Choose this network model if you do <b>*<u>not</u>*</b> want to enable any VLAN support.  All virtual instances created under this network model will be assigned an IP directly from the network and security groups are used to provide security and segregation.
                                     </p>
                                 </div>
                             </div>
@@ -145,7 +145,7 @@
                                 </div>
                                 <div class="zonepopup_selectiondescriptionbox_bot">
                                     <p>
-                                        Create VLAN when add a zone  
+                                        Choose this network model if you wish to enable VLAN support.  This network model provides the most flexibility in allowing administrators to provide custom network offerings such as providing firewall, vpn, or load balancer support as well as enabling direct vs virtual networking.
                                     </p>
                                 </div>
                             </div>