Adjusts warning note in v3.0.0 and moves OLD_CNI_NAME fix

_data/versions.yml

@@ -12,10 +12,11 @@ v3.0:
     
     - You must upgrade to Calico v2.6.5 before you can upgrade to v3.0.1.
     
-    - Those accessing the etcd datastore directly must complete a one-time migration.
+    - Calico deployments that access the etcd datastore directly must complete 
+      a one-time migration.
     
-    - You must convert any customized manifests via `calicoctl convert` before you can
-      use them with v3.0.1.
+    - You must convert any customized Calico manifests via `calicoctl convert` 
+      before you can use them with v3.0.1.
     
     ##### Support for etcdv3
 
@@ -122,6 +123,10 @@ v3.0:
       
     - Typha no longer sends incorrect `updateTypes` to Felix, increasing the accuracy of 
       Felix statistics. [typha #70](https://github.com/projectcalico/typha/pull/70) (@fasaxc)
+      
+    - The CNI plugin now offers an optional environment variable called `CNI_OLD_CONF_NAME`.
+      If set, the CNI plug-in cleans up old configuration data during an upgrade, making it
+      easier to migrate to a new `CNI_CONF_NAME` value. [cni-plugin #392](https://github.com/projectcalico/cni-plugin/pull/392)(@weikinhuang)
 
     #### Limitations
 
@@ -183,9 +188,10 @@ v3.0:
   note: |
     21 December 2017
     
-    > **Important**: Due to a known issue in this release that can cause brief losses 
-    > of connectivity after upgrading from v2.6.4 when using the etcd datastore, this
-    > release is deprecated. Use v3.0.1 instead.
+    > **Important**: Due to a known issue in this release that can cause potential
+    > brief losses of connectivity after upgrading from v2.6.4, this release is 
+    > deprecated. Use v3.0.1 instead. This issue does not affect those using the 
+    > Kubernetes API datastore or running in policy-only mode.
     {: .alert .alert-danger}
 
     #### What's new
@@ -587,10 +593,6 @@ v2.6:
       If this fails, it uses a kernel-generated MAC address as before. For more information,
       refer to the [Troubleshooting FAQ](https://docs.projectcalico.org/v2.6/usage/troubleshooting/). [cni-plugin #436](https://github.com/projectcalico/cni-plugin/pull/436) (@tmjd)
 
-    - The CNI plugin now offers an optional environment variable called `CNI_OLD_CONF_NAME`.
-      If set, the CNI plug-in cleans up old configuration data during an upgrade, making it
-      easier to migrate to a new `CNI_CONF_NAME` value. [cni-plugin #392](https://github.com/projectcalico/cni-plugin/pull/392)(@weikinhuang)
-
     - `calicoctl` now includes a new environment variable called `CALICO_LIBNETWORK_VETH_MTU`
       that allows you to configure the MTU of veth endpoints when using the Docker orchestrator.
       [libnetwork-plugin #164](https://github.com/projectcalico/libnetwork-plugin/pull/164) (@ti-mo)