faq: Fix meter action releases.

At the same time disambiguate some feature descriptions.
'Meters' is changed to 'Meter action' to clarify that the entry
describes the Openflow meter action rather than port based meters.
'NAT' is changed to 'Conntrack NAT' to indicate that this entry
represents NAT done in 'conntrack', rather than basic Openflow
IP address and L4 port modifications.

Signed-off-by: Darrell Ball <dlu998@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/Documentation/faq/releases.rst b/Documentation/faq/releases.rst
index 1dd491266f79898d0e792534630752f9957ee3df..4152345e3f567186084974110c2460a4946b59f8 100644 (file)
--- a/Documentation/faq/releases.rst
+++ b/Documentation/faq/releases.rst
@@ -119,7 +119,7 @@ Q: Are all features available with all datapaths?
     Conntrack Fragment Reass.       4.3            2.6          2.10     YES
     Conntrack Timeout Policies      5.2            2.12         NO       NO
     Conntrack Zone Limit            4.18           2.10         NO       YES
-    NAT                             4.6            2.6          2.8      YES
+    Conntrack NAT                   4.6            2.6          2.8      YES
     Tunnel - LISP                   NO             2.11         NO       NO
     Tunnel - STT                    NO             2.4          NO       YES
     Tunnel - GRE                    3.11           1.0          2.4      YES
@@ -137,7 +137,7 @@ Q: Are all features available with all datapaths?
     Set action                      YES            1.0          1.0    PARTIAL
     NIC Bonding                     YES            1.0          1.0      YES
     Multiple VTEPs                  YES            1.10         1.10     YES
-    Meters                          4.15           1.10         1.10     NO
+    Meter action                    4.15           2.10         2.7      NO
     ========================== ============== ============== ========= =======
 
     Do note, however: