Use classifier versioning.

[cascardo/ovs.git] / utilities / ovs-ofctl.8.in

diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in
index 2c6a073..63c2ecc 100644 (file)
--- a/utilities/ovs-ofctl.8.in
+++ b/utilities/ovs-ofctl.8.in
@@ -298,8 +298,8 @@ These commands manage the flow table in an OpenFlow switch.  In each
 case, \fIflow\fR specifies a flow entry in the format described in
 \fBFlow Syntax\fR, below, \fIfile\fR is a text file that contains zero
 or more flows in the same syntax, one per line, and the optional
-\fB\-\-bundle\fR option operates the command as a single transation,
-see option \fB\-\-bundle\fR, below.
+\fB\-\-bundle\fR option operates the command as a single atomic
+transation, see option \fB\-\-bundle\fR, below.
 .
 .IP "[\fB\-\-bundle\fR] \fBadd\-flow \fIswitch flow\fR"
 .IQ "[\fB\-\-bundle\fR] \fBadd\-flow \fIswitch \fB\- < \fIfile\fR"
@@ -2397,13 +2397,16 @@ depending on its configuration.
 Uses strict matching when running flow modification commands.
 .
 .IP "\fB\-\-bundle\fR"
-Execute flow mods as an OpenFlow 1.4 bundle transaction.
+Execute flow mods as an OpenFlow 1.4 atomic bundle transaction.
 .RS
 .IP \(bu
 Within a bundle, all flow mods are processed in the order they appear
-and as a single transaction, meaning that if one of them fails, the
-whole transaction fails and none of the changes are made to the
-\fIswitch\fR's flow table.
+and as a single atomic transaction, meaning that if one of them fails,
+the whole transaction fails and none of the changes are made to the
+\fIswitch\fR's flow table, and that each given datapath packet
+traversing the OpenFlow tables sees the flow tables either as before
+the transaction, or after all the flow mods in the bundle have been
+successfully applied.
 .IP \(bu
 The beginning and the end of the flow table modification commands in a
 bundle are delimited with OpenFlow 1.4 bundle control messages, which
@@ -2416,10 +2419,6 @@ Bundles require OpenFlow 1.4 or higher.  An explicit \fB-O
 OpenFlow14\fR option is not needed, but you may need to enable
 OpenFlow 1.4 support for OVS by setting the OVSDB \fIprotocols\fR
 column in the \fIbridge\fR table.
-.IP \(bu
-Current implementation executes all bundles with the 'ordered' flag,
-so that the flow mods are always executed in the order specified.
-Atomic bundles are not yet supported.
 .RE
 .
 .so lib/ofp-version.man