debian: Fix references to OpenFlow in ovs-switch-config template

The ovs-switch-config template had clearly not been updated since the
project switched from OpenFlow to Open vSwitch.  This updates the
dialog's so they're consistent with the project's real name.

1 files changed, 38 insertions, 38 deletions

diff --git a/debian/openvswitch-switch-config.templates b/debian/openvswitch-switch-config.templates
index 8ea2d5b4..b2c21842 100644
--- a/debian/openvswitch-switch-config.templates
+++ b/debian/openvswitch-switch-config.templates
@@ -1,36 +1,36 @@
 Template: openvswitch-switch/netdevs
 Type: multiselect
 _Choices: ${choices}
-_Description: OpenFlow switch network devices:
- Choose the network devices that should become part of the OpenFlow
- switch.  At least two devices must be selected for this machine to be
- a useful switch.  Unselecting all network devices will disable the
- OpenFlow switch entirely.
+_Description: Open vSwitch network devices:
+ Choose the network devices that should become part of the Open vSwitch
+ instance.  At least two devices must be selected for this machine to be
+ a useful switch.  Unselecting all network devices will disable 
+ Open vSwitch entirely.
  .
  The network devices that you select should not be configured with IP
  or IPv6 addresses, even if the switch contacts the controller over
  one of the selected network devices.  This is because a running
- OpenFlow switch takes over network devices at a low level: they
+ Open vSwitch takes over network devices at a low level: they
  become part of the switch and cannot be used for other purposes.
 
 Template: openvswitch-switch/no-netdevs
 Type: error
 _Description: No network devices were selected.
- No network devices were selected for inclusion in the OpenFlow switch.
- The switch will be disabled.
+ No network devices were selected for inclusion in the Open vSwitch
+ instance.  The switch will be disabled.
 
 Template: openvswitch-switch/configured-netdevs
 Type: note
 _Description: Some Network Devices Have IP or IPv6 Addresses
- The following network devices selected to be part of the OpenFlow switch
- have IP or IPv6 addresses configured:
+ The following network devices selected to be part of the Open vSwitch
+ instance have IP or IPv6 addresses configured:
  .
  ${configured-netdevs}
  .
  This is usually a mistake, even if the switch contacts the controller over
- one of the selected network devices.  This is because a running
- OpenFlow switch takes over network devices at a low level: they
- become part of the switch and cannot be used for other purposes.
+ one of the selected network devices.  This is because running Open vSwitch 
+ takes over network devices at a low level: they become part of the switch 
+ and cannot be used for other purposes.
  .
  If this is an unintentional mistake, move back and fix the selection,
  or de-configure the IP or IPv6 from these network devices.
@@ -40,12 +40,12 @@ Type: select
 _Choices: discovery, in-band, out-of-band
 Default: discovery
 _Description: Switch-to-controller access method:
- The OpenFlow switch must be able to contact the OpenFlow controller over
- the network.  It can do so in one of three ways:
+ Open vSwitch must be able to contact the OpenFlow controller over the 
+ network.  It can do so in one of three ways:
  .
  discovery: A single network is used for OpenFlow traffic and other
  data traffic; that is, the switch contacts the controller over one of
- the network devices selected as OpenFlow switch network devices in
+ the network devices selected as Open vSwitch network devices in
  the previous question.  The switch automatically determines the
  location of the controller using a DHCP request with an
  OpenFlow-specific vendor option.  This is the most common case.
@@ -56,7 +56,7 @@ _Description: Switch-to-controller access method:
  out-of-band: OpenFlow traffic uses a network separate from the data traffic
  that it controls.  If this is the case, the control network must already
  be configured on a network device other than one of those selected as
- an OpenFlow switch netdev in the previous question.
+ an Open vSwitch netdev in the previous question.
 
 Template: openvswitch-switch/discover
 Type: note
@@ -92,9 +92,9 @@ Template: openvswitch-switch/switch-ip
 Type: string
 Default: dhcp
 _Description: Switch IP address:
- For in-band communication with the controller, the OpenFlow switch must
- be able to determine its own IP address.  Its IP address may be configured
- statically or dynamically.
+ For in-band communication with the controller, the Open vSwitch instance 
+ must be able to determine its own IP address.  Its IP address may be 
+ configured statically or dynamically.
  .
  For static configuration, specify the switch's IP address as a string.
  .
@@ -112,8 +112,8 @@ _Description: The switch IP address is invalid.
 Template: openvswitch-switch/controller-vconn
 Type: string
 _Description: Controller location:
- Specify how the OpenFlow switch should connect to the OpenFlow controller.
- The value should be in form "ssl:IP[:PORT]" to connect to the controller
+ Specify how Open vSwitch should connect to the OpenFlow controller.  The 
+ value should be in form "ssl:IP[:PORT]" to connect to the controller
  over SSL (recommended for security) or "tcp:IP[:PORT]" to connect over
  cleartext TCP.
 
@@ -126,16 +126,16 @@ _Description: The controller location is invalid.
 
 Template: openvswitch-switch/pki-uri
 Type: string
-_Description: OpenFlow PKI server host name or URL:
- Specify a URL to the OpenFlow public key infrastructure (PKI).  If a
+_Description: Open vSwitch PKI server host name or URL:
+ Specify a URL to the Open vSwitch public key infrastructure (PKI).  If a
  host name or IP address is specified in place of a URL, then
  http://<host>/openvswitch/pki/ will be used,
  where <host> is the specified host name or IP address.
  .
- The OpenFlow PKI is usually on the same machine as the OpenFlow
+ The Open vSwitch PKI is usually on the same machine as the OpenFlow
  controller.
  .
- The setup process will connect to the OpenFlow PKI server over
+ The setup process will connect to the Open vSwitch PKI server over
  HTTP, using the system's configured default HTTP proxy (if any).
 
 Template: openvswitch-switch/fetch-cacert-failed
@@ -143,7 +143,7 @@ Type: error
 _Description: The switch CA certificate could not be retrieved.
  Retrieval of ${url} failed, with the following status: "${error}".
  .
- Ensure that the OpenFlow PKI server is correctly configured and
+ Ensure that the Open vSwitch PKI server is correctly configured and
  available at ${pki-uri}.  If the system is configured to use an HTTP
  proxy, also make sure that the HTTP proxy is available and that the
  PKI server can be reached through it.
@@ -166,9 +166,9 @@ Type: select
 _Choices: yes, no
 Default: yes
 _Description: Send certificate request to switch CA?
- Before it can connect to the controller over SSL, the OpenFlow
- switch's key must be signed by the switch certificate authority (CA)
- located on the OpenFlow PKI server, which is usually collocated with
+ Before it can connect to the controller over SSL, the Open vSwitch's
+ key must be signed by the switch certificate authority (CA) located 
+ on the Open vSwitch PKI server, which is usually collocated with
  the OpenFlow controller.  A signing request can be sent to the PKI
  server now.
  .
@@ -185,17 +185,17 @@ Type: error
 _Description: The certificate request could not be sent.
  Posting to ${url} failed, with the following status: "${error}".
  .
- Ensure that the OpenFlow PKI server is correctly configured and
+ Ensure that the Open vSwitch PKI server is correctly configured and
  available at ${pki-uri}.
 
 Template: openvswitch-switch/fetch-switch-cert
 Type: select
 _Choices: yes, no
 _Description: Fetch signed switch certificate from PKI server?
- Before it can connect to the controller over SSL, the OpenFlow
- switch's key must be signed by the switch certificate authority (CA)
- located on the OpenFlow PKI server, which is usually collocated with
- the OpenFlow controller.
+ Before it can connect to the controller over SSL, the Open vSwitch's
+ key must be signed by the switch certificate authority (CA) located 
+ on the Open vSwitch PKI server, which is usually collocated with the 
+ OpenFlow controller.
  .
  At this point, a signing request has been sent to the switch CA (or
  sending a request has been manually skipped), but the signed
@@ -223,6 +223,6 @@ _Description: Signed switch certificate could not be retrieved.
 
 Template: openvswitch-switch/complete
 Type: note
-_Description: OpenFlow Switch Setup Finished
- Setup of this OpenFlow switch is finished.  Complete the setup procedure
- to enable the switch.
+_Description: Open vSwitch Setup Finished
+ Setup of this Open vSwitch instance is finished.  Complete the setup 
+ procedure to enable the switch.