sflow: Write "sFlow" as "sFlow(R)" in documentation.

The sFlow license requires sFlow to be written as sFlow(R) for the first
reference in user documentation, so this commit implements that.

Suggested by Justin Pettit.

diff --git a/README b/README
index dd85be52146f8b62a7fd234f8b749f3ec107903d..a0c9a2e1de450609921a04dd7a08cb1a4965e1a8 100644 (file)
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ What is Open vSwitch?
 Open vSwitch is a multilayer software switch licensed under the open
 source Apache 2 license.  Our goal is to implement a production
 quality switch platform that supports standard management interfaces
-(e.g. NetFlow, sFlow, RSPAN, ERSPAN, IOS-like CLI), and opens the
+(e.g. NetFlow, sFlow(R), RSPAN, ERSPAN, IOS-like CLI), and opens the
 forwarding functions to programmatic extension and control.
 
 Open vSwitch is well suited to function as a virtual switch in VM

diff --git a/vswitchd/ovs-vswitchd.8.in b/vswitchd/ovs-vswitchd.8.in
index 76df35fcaa3b607964eeb90e526d4b4c6b4b9a60..fafc3fe8b681ad7a9592333b8d6ded49035db285 100644 (file)
--- a/vswitchd/ovs-vswitchd.8.in
+++ b/vswitchd/ovs-vswitchd.8.in
@@ -48,7 +48,7 @@ Port mirroring, with optional VLAN tagging.
 NetFlow v5 flow logging.
 .
 .IP \(bu
-sFlow monitoring.
+sFlow(R) monitoring.
 .
 .IP \(bu
 Connectivity to an external OpenFlow controller, such as NOX.

diff --git a/vswitchd/ovs-vswitchd.conf.5.in b/vswitchd/ovs-vswitchd.conf.5.in
index 5449e57c605a76a60f836139f77d29c6a876b99a..c53c4d4d5c9c390f03e719a830fd184e2b10b4bf 100644 (file)
--- a/vswitchd/ovs-vswitchd.conf.5.in
+++ b/vswitchd/ovs-vswitchd.conf.5.in
@@ -460,7 +460,7 @@ netflow.mybr.host=nflow.example.com:9995
 .fi
 .RE
 .SS "sFlow Monitoring"
-sFlow is a protocol for monitoring switches.  A bridge may be
+sFlow(R) is a protocol for monitoring switches.  A bridge may be
 configured to send sFlow records to sFlow collectors by defining the
 key \fBsflow.\fIbridge\fB.host\fR for each collector in the form
 \fIip\fR[\fB:\fIport\fR].  Records from \fIbridge\fR will be sent to