NEWS: NAT and bundles fixes for 2.6 release.

Mention Conntrack NAT support for Linux datapath.  Resolve conflicting
NEWS about bundles support.  Move Linux datapath truncate action
support NEWS to be under the "Linux" heading.

Signed-off-by: Jarno Rajahalme <jarno@ovn.org>
Acked-by: Ben Pfaff <blp@ovn.org>
Acked-by: Justin Pettit <jpettit@ovn.org>

NEWS

@@ -10,6 +10,8 @@ v2.6.0 - xx xxx xxxx
      * New "monitor_cond" "monitor_cond_update" and "update2" extensions to
        RFC 7047.
    - OpenFlow:
+     * OpenFlow 1.3 Extension 230, adding OpenFlow Bundles support, is
+       now implemented.
      * OpenFlow 1.3+ bundles are now supported for group mods as well as
        flow mods and port mods.  Both 'atomic' and 'ordered' bundle
        flags are supported for group mods as well as flow mods.
@@ -21,9 +23,6 @@ v2.6.0 - xx xxx xxxx
        traversal into a continuation for later resumption.
      * New extension message NXT_SET_ASYNC_CONFIG2 to allow OpenFlow 1.4-like
        control over asynchronous messages in earlier versions of OpenFlow.
-     * OpenFlow 1.3 Extension 230, adding OpenFlow Bundles support, is
-       now implemented.  Only flow mod and port mod messages are supported
-       in bundles.
      * New OpenFlow extension NXM_NX_MPLS_TTL to provide access to MPLS TTL.
      * New output option, output(port=N,max_len=M), to allow truncating a
        packet to size M bytes when outputting to port N.
@@ -49,6 +48,9 @@ v2.6.0 - xx xxx xxxx
      * New setting other-config:virtual_obs_id to add an arbitrary string
        to IPFIX records.
    - Linux:
+     * OVS Linux datapath now implements Conntrack NAT action with all
+       supported Linux kernels.
+     * Support for truncate action.
      * New QoS type "linux-noop" that prevents Open vSwitch from trying to
        manage QoS for a given port (useful when other software manages QoS).
    - DPDK:
@@ -98,7 +100,6 @@ v2.6.0 - xx xxx xxxx
    - Datapath Linux kernel compatibility.
      * Dropped support for kernel older than 3.10.
      * Removed VLAN splinters feature.
-     * Support for truncate action.
      * Datapath supports kernel upto 4.6.
    - Tunnels:
      * Flow based tunnel match and action can be used for IPv6 address using