NSX-T --> NSX

NSX-T --> NSX 2

_errands.html.md.erb

@@ -6,7 +6,7 @@ To configure which post-deploy and pre-delete errands run for
 1. Make a selection in the dropdown next to each errand.  
 <% if current_page.data.iaas == "vSphere-NSX-T" %>
     <p class="note"><strong>Note</strong>: We recommend that you use the 
-    default settings for all errands except for the <strong>NSX-T validation</strong> 
+    default settings for all errands except for the <strong>NSX validation</strong> 
     and <strong>Run smoke tests</strong> errands.
     </p> 
 <% else %>
@@ -15,9 +15,9 @@ To configure which post-deploy and pre-delete errands run for
     </p> 
 <% end %>
 <% if current_page.data.iaas == "vSphere-NSX-T" %>
-1. (Optional) Set the **NSX-T validation** errand to **On**.  
+1. (Optional) Set the **NSX validation** errand to **On**.  
 
-    This errand verifies the NSX-T objects.
+    This errand verifies the NSX objects.
 <% end %>
 1. (Optional) Set the **Run smoke tests** errand to **On**.  
 

_ic-network-profile.html.md.erb

@@ -48,7 +48,7 @@ The following table describes the Ingress Controller configuration parameters:
             _ic-network-profile  
             #%>
       <td>Boolean<br><strong>Updatable</strong></td>
-      <td>Use NSX-T layer 4 virtual server for each Kubernetes service of type LoadBalancer.<br>Values: <code>true</code>, <code>false</code>.<br>Default: <code>true</code>.</td>
+      <td>Use NSX layer 4 virtual server for each Kubernetes service of type LoadBalancer.<br>Values: <code>true</code>, <code>false</code>.<br>Default: <code>true</code>.</td>
     </tr>
 <% end %>
 <% if current_page.data.lbtype == "layer4controller" %>
@@ -102,7 +102,7 @@ The following table describes the Ingress Controller configuration parameters:
             _ic-network-profile  
             #%>
       <td>Boolean</td>
-      <td>Use NSX-T layer 7 virtual server as the ingress controller for the Kubernetes cluster. <br>Values: <code>true</code>, <code>false</code>.<br>Default: <code>true</code>.</td>
+      <td>Use NSX layer 7 virtual server as the ingress controller for the Kubernetes cluster. <br>Values: <code>true</code>, <code>false</code>.<br>Default: <code>true</code>.</td>
     </tr>
     <tr>
       <td><code>ingress\_ip</code></td>
@@ -164,15 +164,15 @@ The `nsx_lb` parameter is used to control the TCP layer 4 virtual server that is
 [type: LoadBalancer](https://kubernetes.io/docs/concepts/services-networking/service/#loadbalancer).  
 
 When you configure an NSX Load Balancer as your Kubernetes cluster [ingress resource](https://kubernetes.io/docs/concepts/services-networking/ingress/), 
-NCP instructs the NSX-T Load Balancer to provision two layer 7 virtual services (HTTP and HTTPS) as the cluster 
+NCP instructs the NSX Load Balancer to provision two layer 7 virtual services (HTTP and HTTPS) as the cluster 
 [Ingress Controller](https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/):
 
 <table>
   <th width="20%">nsx_lb setting</th>
   <th>Description</th>
   <tr>
     <td>nsx_lb: <code>true</code></td>
-    <td>Use an NSX-T Layer 4 LoadBalancer and NCP-provisioned Layer 7 Ingress Controller.</td>
+    <td>Use an NSX Layer 4 LoadBalancer and NCP-provisioned Layer 7 Ingress Controller.</td>
   </tr>
   <tr>
     <td>nsx_lb: <code>false</code></td>

_network-profiles-uses.html.md.erb

@@ -1,15 +1,15 @@
 Topic 								              		| Description
 ----------------------------------------------------------------|------------------------------------------------------------------------------
-[Size a Load Balancer](./network-profiles-lb-size.html)	  		| Customize the size of the NSX-T load balancer service that is created when a Kubernetes cluster is provisioned.
+[Size a Load Balancer](./network-profiles-lb-size.html)	  		| Customize the size of the NSX load balancer service that is created when a Kubernetes cluster is provisioned.
 [Customizing Pod Networks](./network-profiles-pods.html) 			| Customize Kubernetes Pod Networks, including adding pod IP addresses, subnet size, and routability.
 [Customize Node Networks](./network-profiles-nodes.html)  			| Customize Kubernetes Node Networks, including the IP addresses, subnet size, and routability.
 [Customize Floating IP Pools](./network-profiles-fip.html)         	| Specify a custom floating IP pool.
-[Configure Bootstrap NSGroups](./network-profiles-ns-groups.html) 	| Specify an NSX-T Namespace Group where the Kubernetes control plane nodes will be added to during cluster creation.
-[Configure Edge Router Selection](./network-profiles-edge.html)	    	| Specify the NSX-T Tier-0 router where Kubernetes node and Pod networks will be connected to.
+[Configure Bootstrap NSGroups](./network-profiles-ns-groups.html) 	| Specify an NSX Namespace Group where the Kubernetes control plane nodes will be added to during cluster creation.
+[Configure Edge Router Selection](./network-profiles-edge.html)	    	| Specify the NSX Tier-0 router where Kubernetes node and Pod networks will be connected to.
 [Specify Nodes DNS Servers](./network-profiles-nodes-dns.html)  	| Specify one or more DNS servers for Kubernetes clusters.
 [Configure DNS for Pre-Provisioned IPs](./network-profiles-dns.html)| Configure DNS lookup of the Kubernetes API load balancer or ingress controller.
 [Configure the TCP Layer 4 Load Balancer](./network-profiles-ncp-lb.html)	| Configure layer 4 TCP load balancer settings; use a third-party load balancer.
 [Configure the HTTP/S Layer 7 Ingress Controller](./network-profiles-ncp-ingress.html)    | Configure layer 7 HTTP/S ingress controller settings; use third-party ingress controller.
 [Define DFW Section Markers](./network-profiles-ncp-dfw.html)           | Configure top or bottom section markers for explicit DFW rule placement.
 [Configure NCP Logging](./network-profiles-ncp-logerr.html) 				| Configure NCP logging.
-[Dedicated Tier-1 Topology](./network-profiles-shared-t1.html#dedicated-t1-profile)		| Use dedicated Tier-1 routers, rather than a shared router, for each cluster's Kube node, Namespace, and NSX-T load balancer.
+[Dedicated Tier-1 Topology](./network-profiles-shared-t1.html#dedicated-t1-profile)		| Use dedicated Tier-1 routers, rather than a shared router, for each cluster's Kube node, Namespace, and NSX load balancer.

_networking-vsphere.html.md.erb

@@ -3,12 +3,12 @@ To configure networking, do the following:
 1. Click **Networking**.
 <% if current_page.data.windowsclusters == true %>
 1. Under **Container Networking Interface**, select:  
-    * **NSX-T** for Windows worker based clusters on vSphere with NSX-T.  
-    * **Flannel** for Windows worker based clusters on vSphere without NSX-T beta.  
+    * **NSX** for Windows worker based clusters on vSphere with NSX.  
+    * **Flannel** for Windows worker based clusters on vSphere without NSX beta.  
 
     <img src="images/networking-flannel-2.png" alt="Networking pane configuration" width="425">
     <p class="note"><strong>Note</strong>: 
-      Antrea is not supported for the <%= vars.k8s_runtime_abbr %> Windows-worker on vSphere without NSX-T beta feature.</p>
+      Antrea is not supported for the <%= vars.k8s_runtime_abbr %> Windows-worker on vSphere without NSX beta feature.</p>
 1. (Optional) Enter values for **Kubernetes Pod Network CIDR Range** and **Kubernetes Service Network CIDR Range**.  
 	* For Windows worker-based clusters the **Kubernetes Service Network CIDR Range** setting must be `10.220.0.0/16`.  
     <p class="note"><strong>Note:</strong> vSphere on Flannel does not support networking Windows containers.

_nsx-t-ingress-lb-overview.html.md.erb

@@ -1,19 +1,19 @@
-The NSX-T Load Balancer 
+The NSX Load Balancer 
 is a logical load balancer that handles a number of functions using virtual servers and pools.  
 
-The NSX-T load balancer creates a load balancer service for each Kubernetes cluster provisioned 
-by <%= vars.product_short %> with NSX-T. For each load balancer service, NCP, by way of the Kubernetes CustomResourceDefinition (CRD), 
+The NSX load balancer creates a load balancer service for each Kubernetes cluster provisioned 
+by <%= vars.product_short %> with NSX. For each load balancer service, NCP, by way of the Kubernetes CustomResourceDefinition (CRD), 
 creates corresponding NSXLoadBalancerMonitor objects.  
 
-By default <%= vars.product_short %> deploys the following NSX-T virtual servers for each Kubernetes cluster:  
+By default <%= vars.product_short %> deploys the following NSX virtual servers for each Kubernetes cluster:  
 
 * One TCP layer 4 load balancer virtual server for the Kubernetes API server.
 * One TCP layer 4 auto-scaled load balancer virtual server for **each** Kubernetes service 
 resource of `type: LoadBalancer`. 
 * Two HTTP/HTTPS layer 7 ingress routing virtual servers. These virtual server are attached to 
 the Kubernetes Ingress Controller cluster load balancer service and can be manually scaled. 
 <%= vars.product_short %> uses Kubernetes custom resources to 
-monitor the state of the NSX-T load balancer service and scale the virtual servers created for ingress. 
+monitor the state of the NSX load balancer service and scale the virtual servers created for ingress. 
 
 <% if current_page.data.lbtype == "monitor" %>
 For information about scaling TCP layer 4 ingress controller see 
@@ -55,7 +55,7 @@ For information about configuring TCP layer 4 ingress routing load balancers see
 [Defining Network Profiles for the TCP Layer 4 Load Balancer](network-profiles-ncp-lb.html).
 <% end %>
 
-For more information about the NSX-T Load Balancer, see 
+For more information about the NSX Load Balancer, see 
 [Create an IP Pool in Manager Mode](https://docs.vmware.com/en/VMware-NSX-T-Data-Center/3.2/administration/GUID-8639F737-1D75-4177-9D31-5F20551DEE8E.html)
 or [Add an IP Address Pool](https://docs.vmware.com/en/VMware-NSX-T-Data-Center/3.2/administration/GUID-C6E60AAC-A24E-4611-A1A0-DC5ADF7DD9F3.html) 
 in the VMware documentation.

_other-super-certificates.html.md.erb

@@ -1,4 +1,4 @@
-To create, delete, and modify NSX-T networking resources, <%= vars.platform_name %> tiles, and APIs use a VMware NSX Manager account with the Enterprise Administrator role and permissions.
+To create, delete, and modify NSX networking resources, <%= vars.platform_name %> tiles, and APIs use a VMware NSX Manager account with the Enterprise Administrator role and permissions.
 
 Users configure <%= vars.platform_name %> to authenticate to NSX Manager for different purposes in different tiles:
 
@@ -17,7 +17,7 @@ Users configure <%= vars.platform_name %> to authenticate to NSX Manager for dif
     The **BOSH Director for vSphere** tile uses NSX Manager to configure networking and security for external-facing <%= vars.platform_name %> component VMs, such as <%= vars.app_runtime_full %> routers.<br><br>
 <% if current_page.data.authenttype == "pkstile" %>
     To configure the **BOSH Director for vSphere** tile's authentication to NSX Manager, see
-    [Configure vCenter for <%= vars.product_short %>](vsphere-nsxt-om-config.html#vcenter-config) in _Configuring BOSH Director with NSX-T for <%= vars.product_short %>_.<br><br>
+    [Configure vCenter for <%= vars.product_short %>](vsphere-nsxt-om-config.html#vcenter-config) in _Configuring BOSH Director with NSX for <%= vars.product_short %>_.<br><br>
 <% end %>
 <% if current_page.data.authenttype == "boshtile" %>
     To configure the **BOSH Director for vSphere** tile's authentication to NSX Manager, see

_plans.html.md.erb

@@ -2,7 +2,7 @@
 A plan defines a set of resource types used for deploying a cluster.
 ####<a id='plan-activate'></a> Activate a Plan
 <p class="note"><strong>Note</strong>: Before configuring your Windows worker plan, you must first activate and configure <strong>Plan 1</strong>.
-See <a href="installing-nsx-t.html#plans">Plans</a> in <i>Installing <%= vars.product_short %> on vSphere with NSX-T</i> for more information.
+See <a href="installing-nsx-t.html#plans">Plans</a> in <i>Installing <%= vars.product_short %> on vSphere with NSX</i> for more information.
 </p>
 <% else %>
 A plan defines a set of resource types used for deploying a cluster.
@@ -29,21 +29,21 @@ You must activate and configure either **Plan 11**, **Plan 12**, or **Plan 13**
 
 <% if current_page.data.windowsclusters != true && current_page.data.iaas != "vSphere" &&  current_page.data.iaas != "vSphere-NSX-T" %>
 1. Click the plan that you want to activate.
-  <p class="note"><strong>Note</strong>: Plans 11, 12, and 13 support Windows worker-based Kubernetes clusters on vSphere with NSX-T, and are a beta feature on vSphere with Flannel.
+  <p class="note"><strong>Note</strong>: Plans 11, 12, and 13 support Windows worker-based Kubernetes clusters on vSphere with NSX, and are a beta feature on vSphere with Flannel.
   </p>
 1. Select **Active** to activate the plan and make it available to developers deploying clusters.<br>
   ![Plan pane configuration](images/plan1.png)
 <% end %>
 <% if current_page.data.windowsclusters != true && (current_page.data.iaas == "vSphere") %>
 1. Click the plan that you want to activate.
-  <p class="note"><strong>Note</strong>: Plans 11, 12, and 13 support Windows worker-based Kubernetes clusters on vSphere with NSX-T, and are a beta feature on vSphere with Flannel.
+  <p class="note"><strong>Note</strong>: Plans 11, 12, and 13 support Windows worker-based Kubernetes clusters on vSphere with NSX, and are a beta feature on vSphere with Flannel.
   To configure a Windows worker plan see <a href="windows-workers.html#plans">Plans</a> in <i>Configuring Windows Worker-Based
   Kubernetes Clusters</i> for more information.
   </p>
 <% end %>
 <% if current_page.data.windowsclusters != true && (current_page.data.iaas == "vSphere-NSX-T") %>
 1. Click the plan that you want to activate.
-  <p class="note"><strong>Note</strong>: Plans 11, 12, and 13 support Windows worker-based Kubernetes clusters on vSphere with NSX-T, and are a beta feature on vSphere with Flannel.
+  <p class="note"><strong>Note</strong>: Plans 11, 12, and 13 support Windows worker-based Kubernetes clusters on vSphere with NSX, and are a beta feature on vSphere with Flannel.
   To configure a Windows worker plan see <a href="windows-workers.html#plans">Plans</a> in <i>Configuring Windows Worker-Based
   Kubernetes Clusters</i> for more information.
   </p>