NEWS: Improve organization.

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

diff --git a/NEWS b/NEWS
index e1f3d33..a6b1599 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -15,20 +15,19 @@ v2.5.0 - xx xxx xxxx
      * OpenFlow 1.4+ OFPTC_VACANCY_EVENTS is now implemented.
      * OpenFlow 1.4+ OFPMP_TABLE_DESC is now implemented.
      * Allow modifying the ICMPv4/ICMPv6 type and code fields.
+     * OpenFlow 1.4+ OFPT_SET_ASYNC_CONFIG and OFPT_GET_ASYNC_CONFIG are
+       now implemented.
    - ovs-ofctl:
      * New "out_group" keyword for OpenFlow 1.1+ matching on output group.
-   - Support for matching/generating options as well as the OAM bit with
-     Geneve tunnels.
+   - Tunnels:
+     * Geneve tunnels can now match and set options and the OAM bit.
+     * The nonstandard GRE64 tunnel extension has been dropped.
    - Support Multicast Listener Discovery (MLDv1 and MLDv2).
    - Add 'symmetric_l3l4' and 'symmetric_l3l4+udp' hash functions.
    - sFlow agent now reports tunnel and MPLS structures.
-   - Added OpenFlow 1.4+ OFPT_SET_ASYNC_CONFIG and OFPT_GET_ASYNC_CONFIG
-     that allows controllers to have more precise control over OpenFlow1.4
-     asynchronous messages.
    - New 'check-system-userspace', 'check-kmod' and 'check-kernel' Makefile
      targets to run a new system testsuite.  These tests can be run inside
      a Vagrant box.  See INSTALL.md for details
-   - Dropped support for GRE64 tunnel.
    - Mark --syslog-target argument as deprecated.  It will be removed in
      the next OVS release.
    - Added --user option to all daemons

diff --git a/debian/changelog b/debian/changelog
index 95c0a5e..cafb1f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,20 +19,19 @@ openvswitch (2.5.0-1) unstable; urgency=low
      * OpenFlow 1.4+ OFPTC_VACANCY_EVENTS is now implemented.
      * OpenFlow 1.4+ OFPMP_TABLE_DESC is now implemented.
      * Allow modifying the ICMPv4/ICMPv6 type and code fields.
+     * OpenFlow 1.4+ OFPT_SET_ASYNC_CONFIG and OFPT_GET_ASYNC_CONFIG are
+       now implemented.
    - ovs-ofctl:
      * New "out_group" keyword for OpenFlow 1.1+ matching on output group.
-   - Support for matching/generating options as well as the OAM bit with
-     Geneve tunnels.
+   - Tunnels:
+     * Geneve tunnels can now match and set options and the OAM bit.
+     * The nonstandard GRE64 tunnel extension has been dropped.
    - Support Multicast Listener Discovery (MLDv1 and MLDv2).
    - Add 'symmetric_l3l4' and 'symmetric_l3l4+udp' hash functions.
    - sFlow agent now reports tunnel and MPLS structures.
-   - Added OpenFlow 1.4+ OFPT_SET_ASYNC_CONFIG and OFPT_GET_ASYNC_CONFIG
-     that allows controllers to have more precise control over OpenFlow1.4
-     asynchronous messages.
    - New 'check-system-userspace', 'check-kmod' and 'check-kernel' Makefile
      targets to run a new system testsuite.  These tests can be run inside
      a Vagrant box.  See INSTALL.md for details
-   - Dropped support for GRE64 tunnel.
    - Mark --syslog-target argument as deprecated.  It will be removed in
      the next OVS release.
    - Added --user option to all daemons