From: Justin Pettit <jpettit@nicira.com>
Date: Wed, 23 Nov 2011 07:50:59 +0000 (-0800)
Subject: mirroring: Use more generic terms for mirroring.
X-Git-Tag: v1.4.0~79
X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=9ae7ddc08260134e4dcba618ba9dc6a09298c756

mirroring: Use more generic terms for mirroring.
---

diff --git a/README b/README
index dddad3f68..6ba2ad7c3 100644
--- a/README
+++ b/README
@@ -22,7 +22,7 @@ vSwitch supports the following features:
 
     * Standard 802.1Q VLAN model with trunk and access ports
     * NIC bonding with or without LACP on upstream switch
-    * NetFlow, sFlow(R), SPAN, RSPAN, and ERSPAN for increased visibility
+    * NetFlow, sFlow(R), and mirroring for increased visibility
     * QoS (Quality of Service) configuration, plus policing
     * GRE, GRE over IPSEC, and CAPWAP tunneling
     * 802.1ag connectivity fault management
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index a467be4e3..55880b80e 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1996,11 +1996,11 @@
     </group>
   </table>
 
-  <table name="Mirror" title="Port mirroring (SPAN/RSPAN/ERSPAN).">
+  <table name="Mirror" title="Port mirroring.">
     <p>A port mirror within a <ref table="Bridge"/>.</p>
     <p>A port mirror configures a bridge to send selected frames to special
     ``mirrored'' ports, in addition to their normal destinations.  Mirroring
-    traffic may also be referred to as SPAN, RSPAN, or ERSPAN, depending on how
+    traffic may also be referred to as SPAN or RSPAN, depending on how
     the mirrored traffic is sent.</p>
 
     <column name="name">
@@ -2048,8 +2048,8 @@
         will be discarded.</p>
         <p>
           The output port may be any kind of port supported by Open vSwitch.
-          It may be, for example, a physical port (sometimes called SPAN), or a
-          GRE tunnel (sometimes called ERSPAN).
+          It may be, for example, a physical port (sometimes called SPAN) or a
+          GRE tunnel.
         </p>
       </column>