Minor cleanup on VMware docs, remove v1000

docs/en-US/vmware-install.xml

@@ -30,9 +30,8 @@
     <title>Preparation Checklist for VMware</title>
     <para>For a smoother installation, gather the following information before you start:</para>
     <itemizedlist>
-        <listitem><para><xref linkend="vmware-vcenter-checklist" /></para></listitem>
+        <listitem><para>Information listed in <xref linkend="vmware-vcenter-checklist" /></para></listitem>
-        <listitem><para><xref linkend="vmware-network-checklist" /></para></listitem>
+        <listitem><para>Information listed in <xref linkend="vmware-network-checklist" /></para></listitem>
-        <listitem><para>In addition to the VMware-specific checklists, you should also see Preparation Checklists</para></listitem>
     </itemizedlist>
     <section id="vmware-vcenter-checklist">
         <title>vCenter Checklist</title>
@@ -148,7 +147,7 @@
     <section id="vmware-vsphere-installation-steps">
     <title>vSphere Installation Steps</title>
     <orderedlist>
-    <listitem><para>Download and purchase vSphere from the VMware Website (<ulink url="https://www.vmware.com/tryvmware/index.php?p=vmware-vsphere&amp;lp=1">https://www.vmware.com/tryvmware/index.php?p=vmware-vsphere&amp;lp=1</ulink>) and install it by following the VMware vSphere Installation Guide.</para></listitem>
+    <listitem><para>If you haven't already, you'll need to download and purchase vSphere from the VMware Website (<ulink url="https://www.vmware.com/tryvmware/index.php?p=vmware-vsphere&amp;lp=1">https://www.vmware.com/tryvmware/index.php?p=vmware-vsphere&amp;lp=1</ulink>) and install it by following the VMware vSphere Installation Guide.</para></listitem>
         <listitem>
         <para>Following installation, perform the following configuration, which are described in the next few sections:</para>
         <informaltable frame="all">
@@ -200,7 +199,7 @@
         </textobject>
     </mediaobject>
     <para>In the host configuration tab, click the &quot;Hardware/Networking&quot; link to bring up the networking configuration page as above.</para>
-    <section id="vmware-physical-host-networking-config-vswitch">
+ <section id="vmware-physical-host-networking-config-vswitch">
         <title>Configure Virtual Switch</title>
         <para>A default virtual switch vSwitch0 is created. &PRODUCT; requires all ESXi hosts in the cloud to use the same set of virtual switch names. If you change the default virtual switch name, you will need to configure one or more &PRODUCT; configuration variables as well.</para>
         <section id="vmware-physical-host-networking-config-vswitch-separate-traffic">
@@ -268,7 +267,7 @@ esxcfg-firewall -o 59000-60000,tcp,out,vncextras
         <para>NIC bonding on vSphere hosts may be done according to the vSphere installation guide.</para>
     </section>
     </section>
-    <section id="vmware-vsphere-cluster-config-nexus-vswitch">
+    <!--    <section id="vmware-vsphere-cluster-config-nexus-vswitch">
     <title>Configuring a vSphere Cluster with Nexus 1000v Virtual Switch</title>
     <para>&PRODUCT; supports Cisco Nexus 1000v dvSwitch (Distributed Virtual Switch) for virtual network configuration in a VMware vSphere environment. This section helps you configure a vSphere cluster with Nexus 1000v virtual switch in a VMware vCenter environment. For information on creating a vSphere cluster, see <xref linkend="vmware-install" /></para>
     <section id="vmware-vsphere-cluster-config-nexus-vswitch-about">
@@ -542,8 +541,8 @@ esxcfg-firewall -o 59000-60000,tcp,out,vncextras
             <para>Click Yes in the confirmation dialog box.</para>
         </listitem>
         </orderedlist>
-    </section>
+    </section> 
-    </section>
+</section> -->
     <section id="vmware-vsphere-iscsi-storage-preparation">
     <title>Storage Preparation for vSphere (iSCSI only)</title>
     <para>Use of iSCSI requires preparatory work in vCenter.  You must add an iSCSI target and create an iSCSI datastore.</para>
@@ -628,5 +627,5 @@ esxcfg-firewall -o 59000-60000,tcp,out,vncextras
     <section id="vmware-add-hosts-config-vsphere-cluster">
     <title>Add Hosts or Configure Clusters (vSphere)</title>
     <para>Use vCenter to create a vCenter cluster and add your desired hosts to the cluster.  You will later add the entire cluster to &PRODUCT;. (see <xref linkend="add-clusters-vsphere" />).</para>
-    </section>
+</section> 
 </section>

docs/en-US/vmware-requirements.xml

@@ -34,7 +34,7 @@
         </listitem>
         <listitem><para>Be sure all the hotfixes provided by the hypervisor vendor are applied. Track the release of hypervisor patches through your hypervisor vendor's support channel, and apply patches as soon as possible after they are released. &PRODUCT; will not track or notify you of required hypervisor patches. It is essential that your hosts are completely up to date with the provided hypervisor patches. The hypervisor vendor is likely to refuse to support any system that is not up to date with patches.</para></listitem>
     </itemizedlist>
-    <warning><para>The lack of up-do-date hotfixes can lead to data corruption and lost VMs.</para></warning>
+    <warning><title>Apply All Necessary Hotfixes</title><para>The lack of up-do-date hotfixes can lead to data corruption and lost VMs.</para></warning>
     </section>
     <section id="vmware-requirements-hardware">
     <title>Hardware requirements:</title>
@@ -53,7 +53,7 @@
     <section id="vmware-requirements-vcenter">
     <title>vCenter Server requirements:</title>
     <itemizedlist>
-        <listitem><para>Processor - 2 CPUs 2.0GHz or higher Intel or AMD x86 processors. Processor may be higher if the database runs on the same machine.</para></listitem>
+        <listitem><para>Processor - 2 CPUs 2.0GHz or higher Intel or AMD x86 processors. Processor requirements may be higher if the database runs on the same machine.</para></listitem>
         <listitem><para>Memory - 3GB RAM. RAM requirements may be higher if your database runs on the same machine.</para></listitem>
         <listitem><para>Disk storage - 2GB. Disk requirements may be higher if your database runs on the same machine.</para></listitem>
         <listitem><para>Microsoft SQL Server 2005 Express disk requirements. The bundled database requires up to 2GB free disk space to decompress the installation archive.</para></listitem>
@@ -71,10 +71,10 @@
         <listitem><para>All hosts must be 64-bit and must support HVM (Intel-VT or AMD-V enabled). All hosts within a cluster must be homogenous. That means the CPUs must be of the same type, count, and feature flags.</para></listitem>
         <listitem><para>The &PRODUCT; management network must not be configured as a separate virtual network. The &PRODUCT; management network is the same as the vCenter management network, and will inherit its configuration. See <xref linkend="vmware-physical-host-networking-config-vcenter-mgt" />.</para></listitem>
         <listitem><para>&PRODUCT; requires ESXi.  ESX is not supported.</para></listitem>
-        <listitem><para>All resources used for &PRODUCT; must be used for &PRODUCT; only.  &PRODUCT; cannot shares instance of ESXi or storage with other management consoles.  Do not share the same storage volumes that will be used by &PRODUCT; with a different set of ESXi servers that are not managed by &PRODUCT;.</para></listitem>
+        <listitem><para>All resources used for &PRODUCT; must be used for &PRODUCT; only.  &PRODUCT; cannot share instance of ESXi or storage with other management consoles.  Do not share the same storage volumes that will be used by &PRODUCT; with a different set of ESXi servers that are not managed by &PRODUCT;.</para></listitem>
         <listitem><para>Put all target ESXi hypervisors in a cluster in a separate Datacenter in vCenter.</para></listitem>
         <listitem><para>The cluster that will be managed by &PRODUCT; should not contain any VMs.  Do not run the management server, vCenter or any other VMs on the cluster that is designated for &PRODUCT; use.  Create  a separate cluster for use of &PRODUCT; and make sure that they are no VMs in this cluster.</para></listitem>
-        <listitem><para>All the required VLANS must be trunked into all network switches that are connected to the ESXi hypervisor hosts.  These would include the VLANS for Management, Storage, vMotion, and guest VLANs.  The guest VLAN (used in Advanced Networking; see Network Setup) is a contiguous range of VLANs that will be managed by &PRODUCT;. &PRODUCT; supports Nexus 1000v virtual switch. For more information, see <xref linkend="vmware-vsphere-cluster-config-nexus-vswitch" />.</para></listitem>
+        <listitem><para>All the required VLANS must be trunked into all network switches that are connected to the ESXi hypervisor hosts.  These would include the VLANS for Management, Storage, vMotion, and guest VLANs.  The guest VLAN (used in Advanced Networking; see Network Setup) is a contiguous range of VLANs that will be managed by &PRODUCT;. <!-- &PRODUCT; supports Nexus 1000v virtual switch. For more information, see <xref linkend="vmware-vsphere-cluster-config-nexus-vswitch" />.--> </para></listitem>
     </itemizedlist>
     </section>
 </section>