From de3f6cfb980d55c6ea3f7bdbaaaf3184d0aef3aa Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 28 Nov 2018 09:58:44 +0100 Subject: [PATCH] doc,all: fix spelling of Open vSwitch (instead of OpenVSwitch) Also affects documentation and translated strings. Reported-by: Flavio Leitner --- NEWS | 4 ++-- clients/common/nm-client-utils.c | 2 +- clients/common/nm-meta-setting-desc.c | 8 ++++---- configure.ac | 4 ++-- man/nm-openvswitch.xml | 18 +++++++++--------- meson.build | 4 ++-- meson_options.txt | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/NEWS b/NEWS index e0d2fbc566..65fec4d2af 100644 --- a/NEWS +++ b/NEWS @@ -140,8 +140,8 @@ Overview of changes since NetworkManager-1.8 This is a new stable release of NetworkManager. Notable changes include: -* NetworkManager includes now basic OpenVSwitch support, good enough - to be capable of setting up simple OpenVSwitch configurations. +* NetworkManager includes now basic Open vSwitch support, good enough + to be capable of setting up simple Open vSwitch configurations. * Added support for activating PPP connections on non-Ethernet interfaces. * It is now possible to authenticate to a Wi-Fi network using WPS diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index 8c7553d83f..8ba2453ee8 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -348,7 +348,7 @@ NM_UTILS_LOOKUP_STR_DEFINE (nmc_device_reason_to_string, NMDeviceStateReason, NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_NEW_ACTIVATION, N_("New connection activation was enqueued")), NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PARENT_CHANGED, N_("The device's parent changed")), NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED, N_("The device parent's management changed")), - NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_OVSDB_FAILED, N_("OpenVSwitch database connection failed")), + NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_OVSDB_FAILED, N_("Open vSwitch database connection failed")), NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_ADDRESS_DUPLICATE, N_("A duplicate IP address was detected")), NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_IP_METHOD_UNSUPPORTED, N_("The selected IP method is not supported")), NM_UTILS_LOOKUP_ITEM (NM_DEVICE_STATE_REASON_SRIOV_CONFIGURATION_FAILED, N_("Failed to configure SR-IOV parameters")), diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 5534f6137d..e94555bc02 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -8052,10 +8052,10 @@ _setting_init_fcn_wireless (ARGS_SETTING_INIT_FCN) #define SETTING_PRETTY_NAME_MACVLAN N_("macvlan connection") #define SETTING_PRETTY_NAME_MATCH N_("Match") #define SETTING_PRETTY_NAME_OLPC_MESH N_("OLPC Mesh connection") -#define SETTING_PRETTY_NAME_OVS_BRIDGE N_("OpenVSwitch bridge settings") -#define SETTING_PRETTY_NAME_OVS_INTERFACE N_("OpenVSwitch interface settings") -#define SETTING_PRETTY_NAME_OVS_PATCH N_("OpenVSwitch patch interface settings") -#define SETTING_PRETTY_NAME_OVS_PORT N_("OpenVSwitch port settings") +#define SETTING_PRETTY_NAME_OVS_BRIDGE N_("Open vSwitch bridge settings") +#define SETTING_PRETTY_NAME_OVS_INTERFACE N_("Open vSwitch interface settings") +#define SETTING_PRETTY_NAME_OVS_PATCH N_("Open vSwitch patch interface settings") +#define SETTING_PRETTY_NAME_OVS_PORT N_("Open vSwitch port settings") #define SETTING_PRETTY_NAME_PPP N_("PPP settings") #define SETTING_PRETTY_NAME_PPPOE N_("PPPoE") #define SETTING_PRETTY_NAME_PROXY N_("Proxy") diff --git a/configure.ac b/configure.ac index aac2a32340..71e4805590 100644 --- a/configure.ac +++ b/configure.ac @@ -828,8 +828,8 @@ else AC_DEFINE(WITH_DHCPCANON, 0, [Define if you have dhcpcanon]) fi -# OpenVSwitch integration -AC_ARG_ENABLE(ovs, AS_HELP_STRING([--enable-ovs], [enable OpenVSwitch support])) +# Open vSwitch integration +AC_ARG_ENABLE(ovs, AS_HELP_STRING([--enable-ovs], [enable Open vSwitch support])) if test "${enable_ovs}" != "no"; then enable_ovs='yes' if test "$have_jansson" = "no"; then diff --git a/man/nm-openvswitch.xml b/man/nm-openvswitch.xml index 7195adcc7b..d156e78e45 100644 --- a/man/nm-openvswitch.xml +++ b/man/nm-openvswitch.xml @@ -26,30 +26,30 @@ nm-openvswitch - NetworkManager OpenVSwitch support + NetworkManager Open vSwitch support nm-openvswitch 7 NetworkManager - OpenVSwitch support overview + Open vSwitch support overview &NM_VERSION; nm-openvswitch - overview of NetworkManager OpenVSwitch support + overview of NetworkManager Open vSwitch support Overview - NetworkManager includes basic OpenVSwitch support, good enough - to be capable of setting up simple OpenVSwitch configurations. It is not - extensive and does not expose all functionality of OpenVSwitch provides. + NetworkManager includes basic Open vSwitch support, good enough + to be capable of setting up simple Open vSwitch configurations. It is not + extensive and does not expose all functionality of Open vSwitch provides. For large or complicated deployments users are advised to use native tools - shipped with OpenVSwitch. This document seeks to provide overview of + shipped with Open vSwitch. This document seeks to provide overview of functionality currently provided by NetworkManager, its capabilities and limitations. @@ -182,10 +182,10 @@ Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully - Not all OpenVSwitch capabilities are supported. + Not all Open vSwitch capabilities are supported. - OpenVSwitch devices don't expose many useful properties on D-Bus. + Open vSwitch devices don't expose many useful properties on D-Bus. Probably many more. diff --git a/meson.build b/meson.build index 9bfc6bb3ee..479ece4a0b 100644 --- a/meson.build +++ b/meson.build @@ -586,10 +586,10 @@ foreach client : [ 'dhclient', 'dhcpcd', 'dhcpcanon' ] dhcp_summary += '\n' endforeach -# OpenVSwitch integration +# Open vSwitch integration enable_ovs = get_option('ovs') if enable_ovs - assert(jansson_dep.found(), 'jansson is needed for OpenVSwitch integration. Use -Dovs=false to disable it') + assert(jansson_dep.found(), 'jansson is needed for Open vSwitch integration. Use -Dovs=false to disable it') endif # DNS resolv.conf managers diff --git a/meson_options.txt b/meson_options.txt index bd8e8b641a..d249567171 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -36,7 +36,7 @@ option('modem_manager', type: 'boolean', value: true, description: 'Enable new M option('ofono', type: 'boolean', value: false, description: 'Enable oFono support (experimental)') option('concheck', type: 'boolean', value: true, description: 'enable connectivity checking support') option('teamdctl', type: 'boolean', value: false, description: 'enable Teamd control support') -option('ovs', type: 'boolean', value: true, description: 'enable OpenVSwitch support') +option('ovs', type: 'boolean', value: true, description: 'enable Open vSwitch support') option('libnm_glib', type: 'boolean', value: false, description: 'build legacy libraries') option('nmcli', type: 'boolean', value: true, description: 'Build nmcli') option('nmtui', type: 'boolean', value: true, description: 'Build nmtui')