From: Ben Pfaff <blp@nicira.com>
Date: Sat, 9 Jan 2010 00:45:02 +0000 (-0800)
Subject: sflow: Write "sFlow" as "sFlow(R)" in documentation.
X-Git-Tag: v0.99.1~1^2~16
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=d1ae82996dcf70bce88bbaff9fc488bec9475fc2

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 dd85be521..a0c9a2e1d 100644
--- 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 76df35fca..fafc3fe8b 100644
--- 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 5449e57c6..c53c4d4d5 100644
--- 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