diff options
| author | Sayed Shah <sayshah@redhat.com> | 2020-07-01 17:20:40 -0400 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-07-03 10:48:04 +0200 |
| commit | 7337ab895951c37258d0634dd709f218109bd49f (patch) | |
| tree | 9bef23382841cc33903b0dfdbf1ed4ace27d0402 | |
| parent | 66e2d8c38a26e3b797fe2cbea961ea942042e13c (diff) | |
| download | NetworkManager-7337ab895951c37258d0634dd709f218109bd49f.tar.gz | |
all: fix typo in man pages
There should be a comma after 'Otherwise' and 'Currently'.
https://bugzilla.redhat.com/show_bug.cgi?id=1852452
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/560
58 files changed, 109 insertions, 109 deletions
@@ -23,7 +23,7 @@ possibly get inspired by nm-connection-editor. * Add Azure support to nm-cloud-setup. -nm-cloud-setup currently only works for EC2 (and only for IPv4). Add support for Azure +Currently, nm-cloud-setup only works for EC2 (and only for IPv4). Add support for Azure cloud. See for example SUSE's cloud-netconfig which supports Azure (https://github.com/SUSE-Enceladus/cloud-netconfig, https://www.suse.com/c/multi-nic-cloud-netconfig-ec2-azure/). Note that cloud-netconfig @@ -33,7 +33,7 @@ anyway be almost impossible, because one is written in bash and the other in C. * Improve our gitlab-ci integration. -Currently our .gitlab-ci starts various base containers and first installs +Currently, our .gitlab-ci starts various base containers and first installs the necessary dependencies. That takes time and consumes bandwidth, we should instead use more suitable containers. We should instead use ci-templates from https://gitlab.freedesktop.org/freedesktop/ci-templates. @@ -110,7 +110,7 @@ connected before the drop. * VPN IP Methods Some VPNs (openvpn with TAP for example) require that DHCP is run on a -pseudo-ethernet device to obtain addressing information. This is not currently +pseudo-ethernet device to obtain addressing information. Currenty, this is not possible, but NM already has all the code for DHCP. Thus, a new "method" key should be defined in include/NetworkManagerVPN.h to allow for DHCP to be performed if the VPN service daemon requests it in the IP4Config or IP6Config diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 44e34d56a6..b0f04f4017 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -5376,7 +5376,7 @@ read_properties: const char *slave_type = nm_setting_connection_get_slave_type (s_con); /* If only bother when there's a type, which is not guaranteed at this point. - * Otherwise the validation will fail anyway. */ + * Otherwise, the validation will fail anyway. */ if (type) { gs_free char *try_name = NULL; gs_free char *default_name = NULL; @@ -6713,7 +6713,7 @@ editor_sub_usage (const char *command) g_print (_("remove [<value>|<index>|<option name>] :: delete the value\n\n" "Removes the property value. For single-valued properties, this sets the\n" "property back to its default value. For container-type properties, this removes\n" - "all the values of that property, or you can specify an argument to remove just\n" + "all the values of that property or you can specify an argument to remove just\n" "a single item or option. The argument is either a value or index of the item to\n" "remove, or an option name (for properties with named options).\n\n" "Examples: nmcli ipv4.dns> remove 8.8.8.8\n" diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 27f72e7787..d5e1f3dcaf 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -806,7 +806,7 @@ usage_device_modify (void) "\n" "ARGUMENTS := <ifname> ([+|-]<setting>.<property> <value>)+\n" "\n" - "Modify one or more properties currently active on the device without modifying\n" + "Modify one or more properties that are currently active on the device without modifying\n" "the connection profile. The changes have immediate effect. For multi-valued\n" "properties you can use optional '+' or '-' prefix to the property name.\n" "The '+' sign allows appending items instead of overwriting the whole value.\n" diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 0487fb9680..c5c79f0987 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -338,7 +338,7 @@ _set_fcn_precheck_connection_secondaries (NMClient *client, g_print (_("Warning: %s is not an UUID of any existing connection profile\n"), *iter); } else { - /* Currently NM only supports VPN connections as secondaries */ + /* Currently, NM only supports VPN connections as secondaries */ if (!nm_connection_is_type (con, NM_SETTING_VPN_SETTING_NAME)) { g_set_error (error, 1, 0, _("'%s' is not a VPN connection profile"), *iter); return FALSE; @@ -351,7 +351,7 @@ _set_fcn_precheck_connection_secondaries (NMClient *client, return FALSE; } - /* Currently NM only supports VPN connections as secondaries */ + /* Currently, NM only supports VPN connections as secondaries */ if (!nm_connection_is_type (con, NM_SETTING_VPN_SETTING_NAME)) { g_set_error (error, 1, 0, _("'%s' is not a VPN connection profile"), *iter); return FALSE; diff --git a/clients/common/nm-client-utils.c b/clients/common/nm-client-utils.c index d3a02161ce..a063fd596d 100644 --- a/clients/common/nm-client-utils.c +++ b/clients/common/nm-client-utils.c @@ -515,7 +515,7 @@ can_show_graphics (void) * Converts @strength into a 4-character-wide graphical representation of * strength suitable for printing to stdout. If the current locale and terminal * support it, this will use unicode graphics characters to represent - * "bars". Otherwise it will use 0 to 4 asterisks. + * "bars". Otherwise, it will use 0 to 4 asterisks. * * Returns: the graphical representation of the access point strength */ diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index c98837611d..d23524fef5 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -841,7 +841,7 @@ _get_fcn_gobject_impl (const NMMetaPropertyInfo *property_info, g_object_get_property (G_OBJECT (setting), property_info->property_name, &val); - /* Currently only one particular property asks us to "handle_emptyunset". + /* Currently, only one particular property asks us to "handle_emptyunset". * So, don't implement it (yet) for the other types, where it's unneeded. */ nm_assert ( !handle_emptyunset || ( gtype_prop == G_TYPE_STRV diff --git a/clients/common/qrcodegen.c b/clients/common/qrcodegen.c index 7cda9659b8..bbbc7d5e5f 100644 --- a/clients/common/qrcodegen.c +++ b/clients/common/qrcodegen.c @@ -970,7 +970,7 @@ struct qrcodegen_Segment qrcodegen_makeEci(long assignVal, uint8_t buf[]) { // Calculates the number of bits needed to encode the given segments at the given version. -// Returns a non-negative number if successful. Otherwise returns -1 if a segment has too +// Returns a non-negative number if successful. Otherwise, returns -1 if a segment has too // many characters to fit its length field, or the total bits exceeds INT16_MAX. testable int getTotalBits(const struct qrcodegen_Segment segs[], size_t len, int version) { assert(segs != NULL || len == 0); diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in index 7ef0b9f5c0..06a707e9c6 100644 --- a/clients/common/settings-docs.h.in +++ b/clients/common/settings-docs.h.in @@ -149,7 +149,7 @@ #define DESCRIBE_DOC_NM_SETTING_CDMA_PASSWORD N_("The password used to authenticate with the network, if required. Many providers do not require a password, or accept any password. But if a password is required, it is specified here.") #define DESCRIBE_DOC_NM_SETTING_CDMA_PASSWORD_FLAGS N_("Flags indicating how to handle the \"password\" property.") #define DESCRIBE_DOC_NM_SETTING_CDMA_USERNAME N_("The username used to authenticate with the network, if required. Many providers do not require a username, or accept any username. But if a username is required, it is specified here.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTH_RETRIES N_("The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently this only applies to 802-1x authentication.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTH_RETRIES N_("The number of retries for the authentication. Zero means to try indefinitely; -1 means to use a global default. If the global default is not set, the authentication retries for 3 times before failing the connection. Currently, this only applies to 802-1x authentication.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT N_("Whether or not the connection should be automatically connected by NetworkManager when the resources for the connection are available. TRUE to automatically activate the connection, FALSE to require manual intervention to activate the connection. Note that autoconnect is not implemented for VPN profiles. See \"secondaries\" as an alternative to automatically connect VPN profiles.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY N_("The autoconnect priority. If the connection is set to autoconnect, connections with higher priority will be preferred. Defaults to 0. The higher number means higher priority.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_AUTOCONNECT_RETRIES N_("The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.") @@ -158,17 +158,17 @@ #define DESCRIBE_DOC_NM_SETTING_CONNECTION_ID N_("A human readable unique identifier for the connection, like \"Work Wi-Fi\" or \"T-Mobile 3G\".") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_INTERFACE_NAME N_("The name of the network interface this connection is bound to. If not set, then the connection can be attached to any interface of the appropriate type (subject to restrictions imposed by other settings). For software devices this specifies the name of the created device. For connection types where interface names cannot easily be made persistent (e.g. mobile broadband or USB Ethernet), this property should not be used. Setting this property restricts the interfaces a connection can be used with, and if interface names change or are reordered the connection may be applied to the wrong interface.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLDP N_("Whether LLDP is enabled for the connection.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLMNR N_("Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable LLMNR for the interface, \"resolve\" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"yes\"). This feature requires a plugin which supports LLMNR. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_LLMNR N_("Whether Link-Local Multicast Name Resolution (LLMNR) is enabled for the connection. LLMNR is a protocol based on the Domain Name System (DNS) packet format that allows both IPv4 and IPv6 hosts to perform name resolution for hosts on the same local link. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable LLMNR for the interface, \"resolve\" (1) do not register hostname but allow resolving of LLMNR host names If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"yes\"). This feature requires a plugin which supports LLMNR. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MASTER N_("Interface name of the master device or UUID of the master connection.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable mDNS for the interface, \"resolve\" (1) do not register hostname but allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"no\"). This feature requires a plugin which supports mDNS. Otherwise the setting has no effect. One such plugin is dns-systemd-resolved.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_MDNS N_("Whether mDNS is enabled for the connection. The permitted values are: \"yes\" (2) register hostname and resolving for the connection, \"no\" (0) disable mDNS for the interface, \"resolve\" (1) do not register hostname but allow resolving of mDNS host names and \"default\" (-1) to allow lookup of a global default in NetworkManager.conf. If unspecified, \"default\" ultimately depends on the DNS plugin (which for systemd-resolved currently means \"no\"). This feature requires a plugin which supports mDNS. Otherwise, the setting has no effect. One such plugin is dns-systemd-resolved.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_METERED N_("Whether the connection is metered. When updating this property on a currently activated connection, the change takes effect immediately.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MUD_URL N_("If configured, set to a Manufacturer Usage Description (MUD) URL that points to manufacturer-recommended network policies for IoT devices. It is transmitted as a DHCPv4 or DHCPv6 option. The value must be a valid URL starting with \"https://\". The special value \"none\" is allowed to indicate that no MUD URL is used. If the per-profile value is unspecified (the default), a global connection default gets consulted. If still unspecified, the ultimate default is \"none\".") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_MULTI_CONNECT N_("Specifies whether the profile can be active multiple times at a particular moment. The value is of type NMConnectionMultiConnect.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_PERMISSIONS N_("An array of strings defining what access a given user has to this connection. If this is NULL or empty, all users are allowed to access this connection; otherwise users are allowed if and only if they are in this list. When this is not empty, the connection can be active only when one of the specified users is logged into an active session. Each entry is of the form \"[type]:[id]:[reserved]\"; for example, \"user:dcbw:blah\". At this time only the \"user\" [type] is allowed. Any other values are ignored and reserved for future use. [id] is the username that this permission refers to, which may not contain the \":\" character. Any [reserved] information present must be ignored and is reserved for future use. All of [type], [id], and [reserved] must be valid UTF-8.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_READ_ONLY N_("FALSE if the connection can be modified using the provided settings service's D-Bus interface with the right privileges, or TRUE if the connection is read-only and cannot be modified.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_SECONDARIES N_("List of connection UUIDs that should be activated when the base connection itself is activated. Currently only VPN connections are supported.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_SECONDARIES N_("List of connection UUIDs that should be activated when the base connection itself is activated. Currently, only VPN connections are supported.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_SLAVE_TYPE N_("Setting name of the device type of this slave's master connection (eg, \"bond\"), or NULL if this connection is not a slave.") -#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds to the interface name of the device and \"${MAC}\" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.") +#define DESCRIBE_DOC_NM_SETTING_CONNECTION_STABLE_ID N_("This represents the identity of the connection used for various purposes. It allows to configure multiple profiles to share the identity. Also, the stable-id can contain placeholders that are substituted dynamically and deterministically depending on the context. The stable-id is used for generating IPv6 stable private addresses with ipv6.addr-gen-mode=stable-privacy. It is also used to seed the generated cloned MAC address for ethernet.cloned-mac-address=stable and wifi.cloned-mac-address=stable. It is also used as DHCP client identifier with ipv4.dhcp-client-id=stable and to derive the DHCP DUID with ipv6.dhcp-duid=stable-[llt,ll,uuid]. Note that depending on the context where it is used, other parameters are also seeded into the generation algorithm. For example, a per-host key is commonly also included, so that different systems end up generating different IDs. Or with ipv6.addr-gen-mode=stable-privacy, also the device's name is included, so that different interfaces yield different addresses. The '$' character is treated special to perform dynamic substitutions at runtime. Currently, supported are \"${CONNECTION}\", \"${DEVICE}\", \"${MAC}\", \"${BOOT}\", \"${RANDOM}\". These effectively create unique IDs per-connection, per-device, per-boot, or every time. Note that \"${DEVICE}\" corresponds to the interface name of the device and \"${MAC}\" is the permanent MAC address of the device. Any unrecognized patterns following '$' are treated verbatim, however are reserved for future use. You are thus advised to avoid '$' or escape it as \"$$\". For example, set it to \"${CONNECTION}-${BOOT}-${DEVICE}\" to create a unique id for this connection that changes with every reboot and differs depending on the interface where the profile activates. If the value is unset, a global connection default is consulted. If the value is still unset, the default is similar to \"${CONNECTION}\" and uses a unique, fixed ID for the connection.") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TIMESTAMP N_("The time, in seconds since the Unix Epoch, that the connection was last _successfully_ fully activated. NetworkManager updates the connection timestamp periodically when the connection is active to ensure that an active connection has the latest timestamp. The property is only meant for reading (changes to this property will not be preserved).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_TYPE N_("Base type of the connection. For hardware-dependent connections, should contain the setting name of the hardware-type specific setting (ie, \"802-3-ethernet\" or \"802-11-wireless\" or \"bluetooth\", etc), and for non-hardware dependent connections like VPN or otherwise, should contain the setting name of that setting type (ie, \"vpn\" or \"bridge\", etc).") #define DESCRIBE_DOC_NM_SETTING_CONNECTION_UUID N_("A universally unique identifier for the connection, for example generated with libuuid. It should be assigned when the connection is created, and never changed as long as the connection still applies to the same network. For example, it should not be changed when the \"id\" property or NMSettingIP4Config changes, but might need to be re-created when the Wi-Fi SSID, mobile broadband network provider, or \"type\" property changes. The UUID must be in the format \"2815492f-7e56-435e-b2e9-246bd7cdc664\" (ie, contains only hexadecimal characters and \"-\").") @@ -205,11 +205,11 @@ #define DESCRIBE_DOC_NM_SETTING_GSM_USERNAME N_("The username used to authenticate with the network, if required. Many providers do not require a username, or accept any username. But if a username is required, it is specified here.") #define DESCRIBE_DOC_NM_SETTING_INFINIBAND_MAC_ADDRESS N_("If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).") #define DESCRIBE_DOC_NM_SETTING_INFINIBAND_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.") -#define DESCRIBE_DOC_NM_SETTING_INFINIBAND_P_KEY N_("The InfiniBand P_Key to use for this device. A value of -1 means to use the default P_Key (aka \"the P_Key at index 0\"). Otherwise it is a 16-bit unsigned integer, whose high bit is set if it is a \"full membership\" P_Key.") +#define DESCRIBE_DOC_NM_SETTING_INFINIBAND_P_KEY N_("The InfiniBand P_Key to use for this device. A value of -1 means to use the default P_Key (aka \"the P_Key at index 0\"). Otherwise, it is a 16-bit unsigned integer, whose high bit is set if it is a \"full membership\" P_Key.") #define DESCRIBE_DOC_NM_SETTING_INFINIBAND_PARENT N_("The interface name of the parent device of this device. Normally NULL, but if the \"p_key\" property is set, then you must specify the base device by setting either this property or \"mac-address\".") #define DESCRIBE_DOC_NM_SETTING_INFINIBAND_TRANSPORT_MODE N_("The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\".") #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_ENCAPSULATION_LIMIT N_("How many additional levels of encapsulation are permitted to be prepended to packets. This property applies only to IPv6 tunnels.") -#define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_FLAGS N_("Tunnel flags. Currently the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.") +#define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_FLAGS N_("Tunnel flags. Currently, the following values are supported: NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT (0x1), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS (0x2), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL (0x4), NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV (0x8), NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY (0x10), NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK (0x20). They are valid only for IPv6 tunnels.") #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_FLOW_LABEL N_("The flow label to assign to tunnel packets. This property applies only to IPv6 tunnels.") #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_INPUT_KEY N_("The key used for tunnel input packets; the property is valid only for certain tunnel modes (GRE, IP6GRE). If empty, no key is used.") #define DESCRIBE_DOC_NM_SETTING_IP_TUNNEL_LOCAL N_("The local endpoint of the tunnel; the value can be empty, otherwise it must contain an IPv4 or IPv6 address.") @@ -226,7 +226,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID N_("A string sent to the DHCP server to identify the local machine which the DHCP server may use to customize the DHCP lease and options. When the property is a hex string ('aa:bb:cc') it is interpreted as a binary client ID, in which case the first byte is assumed to be the 'type' field as per RFC 2132 section 9.14 and the remaining bytes may be an hardware address (e.g. '01:xx:xx:xx:xx:xx:xx' where 1 is the Ethernet ARP type and the rest is a MAC address). If the property is not a hex string it is considered as a non-hardware-address client ID and the 'type' field is set to 0. The special values \"mac\" and \"perm-mac\" are supported, which use the current or permanent MAC address of the device to generate a client identifier with type ethernet (01). Currently, these options only work for ethernet type of links. The special value \"duid\" generates a RFC4361-compliant client identifier based on a hash of the interface name as IAID and /etc/machine-id. The special value \"stable\" is supported to generate a type 0 client identifier based on the stable-id (see connection.stable-id) and a per-host key. If you set the stable-id, you may want to include the \"${DEVICE}\" or \"${MAC}\" specifier to get a per-device key. If unset, a globally configured default is used. If still unset, the default depends on the DHCP plugin.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_FQDN N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-hostname\" are mutually exclusive and cannot be set at the same time.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") -#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4). When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.") +#define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4). When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.") #define DESCRIBE_DOC_NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.") @@ -248,7 +248,7 @@ #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DAD_TIMEOUT N_("Timeout in milliseconds used to check for the presence of duplicate IP addresses on the network. If an address conflict is detected, the activation will fail. A zero value means that no duplicate address detection is performed, -1 means the default value (either configuration ipvx.dad-timeout override or zero). A value greater than zero is a timeout in milliseconds. The property is currently implemented only for IPv4.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_DUID N_("A string containing the DHCPv6 Unique Identifier (DUID) used by the dhcp client to identify itself to DHCPv6 servers (RFC 3315). The DUID is carried in the Client Identifier option. If the property is a hex string ('aa:bb:cc') it is interpreted as a binary DUID and filled as an opaque value in the Client Identifier option. The special value \"lease\" will retrieve the DUID previously used from the lease file belonging to the connection. If no DUID is found and \"dhclient\" is the configured dhcp client, the DUID is searched in the system-wide dhclient lease file. If still no DUID is found, or another dhcp client is used, a global and permanent DUID-UUID (RFC 6355) will be generated based on the machine-id. The special values \"llt\" and \"ll\" will generate a DUID of type LLT or LL (see RFC 3315) based on the current MAC address of the device. In order to try providing a stable DUID-LLT, the time field will contain a constant timestamp that is used globally (for all profiles) and persisted to disk. The special values \"stable-llt\", \"stable-ll\" and \"stable-uuid\" will generate a DUID of the corresponding type, derived from the connection's stable-id and a per-host unique key. You may want to include the \"${DEVICE}\" or \"${MAC}\" specifier in the stable-id, in case this profile gets activated on multiple devices. So, the link-layer address of \"stable-ll\" and \"stable-llt\" will be a generated address derived from the stable id. The DUID-LLT time value in the \"stable-llt\" option will be picked among a static timespan of three years (the upper bound of the interval is the same constant timestamp used in \"llt\"). When the property is unset, the global value provided for \"ipv6.dhcp-duid\" is used. If no global value is provided, the default \"lease\" value is assumed.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME N_("If the \"dhcp-send-hostname\" property is TRUE, then the specified name will be sent to the DHCP server when acquiring a lease. This property and \"dhcp-fqdn\" are mutually exclusive and cannot be set at the same time.") -#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4). When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.") +#define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME_FLAGS N_("Flags for the DHCP hostname and FQDN. Currently, this property only includes flags to control the FQDN flags set in the DHCP FQDN option. Supported FQDN flags are NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) and NM_DHCP_HOSTNAME_FLAG_FQDN_NO_UPDATE (0x4). When no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is set, the DHCP FQDN option will contain no flag. Otherwise, if no FQDN flag is set and NM_DHCP_HOSTNAME_FLAG_FQDN_CLEAR_FLAGS (0x8) is not set, the standard FQDN flags are set in the request: NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1), NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED (0x2) for IPv4 and NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE (0x1) for IPv6. When this property is set to the default value NM_DHCP_HOSTNAME_FLAG_NONE (0x0), a global default is looked up in NetworkManager configuration. If that value is unset or also NM_DHCP_HOSTNAME_FLAG_NONE (0x0), then the standard FQDN flags described above are sent in the DHCP requests.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_IAID N_("A string containing the \"Identity Association Identifier\" (IAID) used by the DHCP client. The property is a 32-bit decimal value or a special value among \"mac\", \"perm-mac\", \"ifname\" and \"stable\". When set to \"mac\" (or \"perm-mac\"), the last 4 bytes of the current (or permanent) MAC address are used as IAID. When set to \"ifname\", the IAID is computed by hashing the interface name. The special value \"stable\" can be used to generate an IAID based on the stable-id (see connection.stable-id), a per-host key and the interface name. When the property is unset, the value from global configuration is used; if no global default is set then the IAID is assumed to be \"ifname\". Note that at the moment this property is ignored for IPv6 by dhclient, which always derives the IAID from the MAC address.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_SEND_HOSTNAME N_("If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some DHCP servers use this hostname to update DNS databases, essentially providing a static hostname for the computer. If the \"dhcp-hostname\" property is NULL and this property is TRUE, the current persistent hostname of the computer is sent.") #define DESCRIBE_DOC_NM_SETTING_IP6_CONFIG_DHCP_TIMEOUT N_("A timeout for a DHCP transaction in seconds. If zero (the default), a globally configured default is used. If still unspecified, a device specific timeout is used (usually 45 seconds). Set to 2147483647 (MAXINT32) for infinity.") @@ -333,7 +333,7 @@ #define DESCRIBE_DOC_NM_SETTING_SERIAL_STOPBITS N_("Number of stop bits for communication on the serial port. Either 1 or 2. The 1 in \"8n1\" for example.") #define DESCRIBE_DOC_NM_SETTING_SRIOV_AUTOPROBE_DRIVERS N_("Whether to autoprobe virtual functions by a compatible driver. If set to NM_TERNARY_TRUE (1), the kernel will try to bind VFs to a compatible driver and if this succeeds a new network interface will be instantiated for each VF. If set to NM_TERNARY_FALSE (0), VFs will not be claimed and no network interfaces will be created for them. When set to NM_TERNARY_DEFAULT (-1), the global default is used; in case the global default is unspecified it is assumed to be NM_TERNARY_TRUE (1).") #define DESCRIBE_DOC_NM_SETTING_SRIOV_TOTAL_VFS N_("The total number of virtual functions to create. Note that when the sriov setting is present NetworkManager enforces the number of virtual functions on the interface (also when it is zero) during activation and resets it upon deactivation. To prevent any changes to SR-IOV parameters don't add a sriov setting to the connection.") -#define DESCRIBE_DOC_NM_SETTING_SRIOV_VFS N_("Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-check=true\". Multiple VFs can be specified using a comma as separator. Currently the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.") +#define DESCRIBE_DOC_NM_SETTING_SRIOV_VFS N_("Array of virtual function descriptors. Each VF descriptor is a dictionary mapping attribute names to GVariant values. The 'index' entry is mandatory for each VF. When represented as string a VF is in the form: \"INDEX [ATTR=VALUE[ ATTR=VALUE]...]\". for example: \"2 mac=00:11:22:33:44:55 spoof-check=true\". Multiple VFs can be specified using a comma as separator. Currently, the following attributes are supported: mac, spoof-check, trust, min-tx-rate, max-tx-rate, vlans. The \"vlans\" attribute is represented as a semicolon-separated list of VLAN descriptors, where each descriptor has the form \"ID[.PRIORITY[.PROTO]]\". PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.") #define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS N_("Array of TC queueing disciplines.") #define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_TFILTERS N_("Array of TC traffic filters.") #define DESCRIBE_DOC_NM_SETTING_TEAM_CONFIG N_("The JSON configuration for the team network interface. The property should contain raw JSON configuration data suitable for teamd, because the value is passed directly to teamd. If not specified, the default configuration is used. See man teamd.conf for the format details.") @@ -394,12 +394,12 @@ #define DESCRIBE_DOC_NM_SETTING_VXLAN_SOURCE_PORT_MIN N_("Specifies the minimum UDP source port to communicate to the remote VXLAN tunnel endpoint.") #define DESCRIBE_DOC_NM_SETTING_VXLAN_TOS N_("Specifies the TOS value to use in outgoing packets.") #define DESCRIBE_DOC_NM_SETTING_VXLAN_TTL N_("Specifies the time-to-live value to use in outgoing packets.") -#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_PEER N_("The P2P device that should be connected to. Currently this is the only way to create or join a group.") +#define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_PEER N_("The P2P device that should be connected to. Currently, this is the only way to create or join a group.") #define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WFD_IES N_("The Wi-Fi Display (WFD) Information Elements (IEs) to set. Wi-Fi Display requires a protocol specific information element to be set in certain Wi-Fi frames. These can be specified here for the purpose of establishing a connection. This setting is only useful when implementing a Wi-Fi Display client.") #define DESCRIBE_DOC_NM_SETTING_WIFI_P2P_WPS_METHOD N_("Flags indicating which mode of WPS is to be used. There's little point in changing the default setting as NetworkManager will automatically determine the best method to use.") #define DESCRIBE_DOC_NM_SETTING_WIMAX_MAC_ADDRESS N_("If specified, this connection will only apply to the WiMAX device whose MAC address matches. This property does not change the MAC address of the device (known as MAC spoofing). Deprecated: 1") #define DESCRIBE_DOC_NM_SETTING_WIMAX_NETWORK_NAME N_("Network Service Provider (NSP) name of the WiMAX network this connection should use. Deprecated: 1") -#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise it is a 32-bit fwmark for outgoing packets. Note that \"ip4-auto-default-route\" or \"ip6-auto-default-route\" enabled, implies to automatically choose a fwmark.") +#define DESCRIBE_DOC_NM_SETTING_WIREGUARD_FWMARK N_("The use of fwmark is optional and is by default off. Setting it to 0 disables it. Otherwise, it is a 32-bit fwmark for outgoing packets. Note that \"ip4-auto-default-route\" or \"ip6-auto-default-route\" enabled, implies to automatically choose a fwmark.") #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_IP4_AUTO_DEFAULT_ROUTE N_("Whether to enable special handling of the IPv4 default route. If enabled, the IPv4 default route from wireguard.peer-routes will be placed to a dedicated routing-table and two policy routing rules will be added. The fwmark number is also used as routing-table for the default-route, and if fwmark is zero, an unused fwmark/table is chosen automatically. This corresponds to what wg-quick does with Table=auto and what WireGuard calls \"Improved Rule-based Routing\". Note that for this automatism to work, you usually don't want to set ipv4.gateway, because that will result in a conflicting default route. Leaving this at the default will enable this option automatically if ipv4.never-default is not set and there are any peers that use a default-route as allowed-ips.") #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_IP6_AUTO_DEFAULT_ROUTE N_("Like ip4-auto-default-route, but for the IPv6 default route.") #define DESCRIBE_DOC_NM_SETTING_WIREGUARD_LISTEN_PORT N_("The listen-port. If listen-port is not specified, the port will be chosen randomly when the interface comes up.") diff --git a/clients/tui/nmt-mtu-entry.c b/clients/tui/nmt-mtu-entry.c index c6077a657e..f782ee0104 100644 --- a/clients/tui/nmt-mtu-entry.c +++ b/clients/tui/nmt-mtu-entry.c @@ -13,7 +13,7 @@ * contains a valid MTU. * * The entry also has an attached #NmtNewtLabel. When the entry value - * is "0", the label will read "(default)". Otherwise it reads "bytes", + * is "0", the label will read "(default)". Otherwise, it reads "bytes", * indicating the units used by the entry. */ diff --git a/configure.ac b/configure.ac index 2ace7ecaee..1e6823b494 100644 --- a/configure.ac +++ b/configure.ac @@ -174,7 +174,7 @@ AC_ARG_ENABLE(ifupdown, AS_HELP_STRING([--enable-ifupdown], [enable ifupdown con # Default alternative plugins by distribution AS_IF([test -z "$enable_ifcfg_rh" -a -d /etc/sysconfig/network-scripts], enable_ifcfg_rh=yes) AS_IF([test -z "$enable_ifupdown" -a -f /etc/debian_version], enable_ifupdown=yes) -# Otherwise plugins default to "no" +# Otherwise, plugins default to "no" AS_IF([test -z "$enable_ifcfg_rh"], enable_ifcfg_rh=no) AS_IF([test -z "$enable_ifupdown"], enable_ifupdown=no) # Create automake conditionals @@ -915,7 +915,7 @@ if test "$config_dns_rc_manager_default" != "" -a \ fi # Use netconfig by default on SUSE AS_IF([test -z "$with_netconfig" -a -f /etc/SuSE-release], with_netconfig=yes) -# Otherwise default to "no" +# Otherwise, default to "no" AS_IF([test -z "$with_resolvconf"], with_resolvconf=no) AS_IF([test -z "$with_netconfig"], with_netconfig=no) diff --git a/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml b/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml index 9e74eb6e56..f5e2fdceaa 100644 --- a/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml +++ b/introspection/org.freedesktop.NetworkManager.Device.WifiP2P.xml @@ -31,7 +31,7 @@ <!-- StartFind: - @options: Options of find. Currently 'timeout' option with value of "i" + @options: Options of find. Currently, 'timeout' option with value of "i" in the range of 1-600 seconds is supported. The default is 30 seconds. diff --git a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml index d9af0964ec..c043a2c2f7 100644 --- a/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml +++ b/introspection/org.freedesktop.NetworkManager.Device.Wireless.xml @@ -34,7 +34,7 @@ <!-- RequestScan: - @options: Options of scan. Currently 'ssids' option with value of "aay" type is supported. + @options: Options of scan. Currently, 'ssids' option with value of "aay" type is supported. Request the device to scan. To know when the scan is finished, use the "PropertiesChanged" signal from "org.freedesktop.DBus.Properties" to listen to changes to the "LastScan" property. --> diff --git a/introspection/org.freedesktop.NetworkManager.IP4Config.xml b/introspection/org.freedesktop.NetworkManager.IP4Config.xml index e4388fd4fe..8ee29c3e08 100644 --- a/introspection/org.freedesktop.NetworkManager.IP4Config.xml +++ b/introspection/org.freedesktop.NetworkManager.IP4Config.xml @@ -62,7 +62,7 @@ <!-- NameserverData: - The nameservers in use. Currently only the value "address" + The nameservers in use. Currently, only the value "address" is recognized (with an IP address string). Since: 1.14 diff --git a/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml index 6211274fd9..98c73dff66 100644 --- a/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml +++ b/introspection/org.freedesktop.NetworkManager.Settings.Connection.xml @@ -105,7 +105,7 @@ Update2: @settings: New connection settings, properties, and (optionally) secrets. Provide an empty array, to use the current settings. - @flags: optional flags argument. Currently supported flags are: + @flags: optional flags argument. Currently, supported flags are: "0x1" (to-disk), "0x2" (in-memory), "0x4" (in-memory-detached), @@ -114,7 +114,7 @@ "0x20" (block-autoconnect), "0x40" (no-reapply). Unknown flags cause the call to fail. - @args: optional arguments dictionary, for extensibility. Currently no + @args: optional arguments dictionary, for extensibility. Currently, no arguments are accepted. Specifying unknown keys causes the call to fail. @result: output argument, currently no results are returned. diff --git a/introspection/org.freedesktop.NetworkManager.Settings.xml b/introspection/org.freedesktop.NetworkManager.Settings.xml index 42e6f1ef85..5e6108435c 100644 --- a/introspection/org.freedesktop.NetworkManager.Settings.xml +++ b/introspection/org.freedesktop.NetworkManager.Settings.xml @@ -66,12 +66,12 @@ <!-- AddConnection2: @settings: New connection settings, properties, and (optionally) secrets. - @flags: optional flags argument. Currently the following flags are supported: + @flags: optional flags argument. Currently, the following flags are supported: "0x1" (to-disk), "0x2" (in-memory), "0x20" (block-autoconnect). Unknown flags cause the call to fail. - @args: optional arguments dictionary, for extensibility. Currently no + @args: optional arguments dictionary, for extensibility. Currently, no arguments are accepted. Specifying unknown keys causes the call to fail. @path: Object path of the new connection that was just added. diff --git a/introspection/org.freedesktop.NetworkManager.xml b/introspection/org.freedesktop.NetworkManager.xml index 0ebfe2434f..19bedcac6f 100644 --- a/introspection/org.freedesktop.NetworkManager.xml +++ b/introspection/org.freedesktop.NetworkManager.xml @@ -119,7 +119,7 @@ @options: Further options for the method call. @path: Object path of the new connection that was just added. @active_connection: The path of the active connection object representing this active connection. - @result: a dictionary of additional output arguments for future extension. Currently not additional + @result: a dictionary of additional output arguments for future extension. Currently, not additional output arguments are supported. Adds a new connection using the given details (if any) as a template diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c index 5f18b651cb..62f6995cdf 100644 --- a/libnm-core/nm-connection.c +++ b/libnm-core/nm-connection.c @@ -2089,7 +2089,7 @@ _clear_secrets_by_secret_flags_cb (NMSetting *setting, /* Can't use bitops with SECRET_FLAG_NONE so handle that specifically */ remove_secret = (flags != NM_SETTING_SECRET_FLAG_NONE); } else { - /* Otherwise if the secret has at least one of the desired flags keep it */ + /* Otherwise, if the secret has at least one of the desired flags keep it */ remove_secret = !NM_FLAGS_ANY (flags, filter_flags); } diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c index 72b9fe1f44..c099ff472c 100644 --- a/libnm-core/nm-dbus-utils.c +++ b/libnm-core/nm-dbus-utils.c @@ -201,7 +201,7 @@ _nm_dbus_typecheck_response (GVariant *response, * will also check that the response matches that type signature, and return * an error if not. * - * Returns: %NULL if @error is set. Otherwise a #GVariant tuple with + * Returns: %NULL if @error is set. Otherwise, a #GVariant tuple with * return values. Free with g_variant_unref(). */ GVariant * diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index f6dbda6341..93478c22e3 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -990,7 +990,7 @@ nm_setting_802_1x_get_ca_cert_path (NMSetting8021x *setting) * nm_setting_802_1x_get_ca_cert_blob() and * nm_setting_802_1x_get_ca_cert_path(). * - * Currently it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC + * Currently, it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC * 7512), but may be extended to other schemes in future (such as 'file' URIs * for local files and 'data' URIs for inline certificate data). * @@ -1321,7 +1321,7 @@ nm_setting_802_1x_get_client_cert_path (NMSetting8021x *setting) * nm_setting_802_1x_get_client_cert_blob() and * nm_setting_802_1x_get_client_cert_path(). * - * Currently it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC + * Currently, it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC * 7512), but may be extended to other schemes in future (such as 'file' URIs * for local files and 'data' URIs for inline certificate data). * @@ -1583,7 +1583,7 @@ nm_setting_802_1x_get_phase2_ca_cert_path (NMSetting8021x *setting) * nm_setting_802_1x_get_phase2_ca_cert_blob() and * nm_setting_802_1x_get_phase2_ca_cert_path(). * - * Currently it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC + * Currently, it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC * 7512), but may be extended to other schemes in future (such as 'file' URIs * for local files and 'data' URIs for inline certificate data). * @@ -1918,7 +1918,7 @@ nm_setting_802_1x_get_phase2_client_cert_path (NMSetting8021x *setting) * nm_setting_802_1x_get_phase2_ca_cert_blob() and * nm_setting_802_1x_get_phase2_ca_cert_path(). * - * Currently it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC + * Currently, it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC * 7512), but may be extended to other schemes in future (such as 'file' URIs * for local files and 'data' URIs for inline certificate data). * @@ -2154,7 +2154,7 @@ nm_setting_802_1x_get_private_key_path (NMSetting8021x *setting) * nm_setting_802_1x_get_private_key_blob() and * nm_setting_802_1x_get_private_key_path(). * - * Currently it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC + * Currently, it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC * 7512), but may be extended to other schemes in future (such as 'file' URIs * for local files and 'data' URIs for inline certificate data). * @@ -2357,7 +2357,7 @@ nm_setting_802_1x_get_phase2_private_key_path (NMSetting8021x *setting) * nm_setting_802_1x_get_phase2_private_key_blob() and * nm_setting_802_1x_get_phase2_private_key_path(). * - * Currently it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC + * Currently, it's limited to PKCS#11 URIs ('pkcs11' scheme as defined by RFC * 7512), but may be extended to other schemes in future (such as 'file' URIs * for local files and 'data' URIs for inline certificate data). * diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 018129bef2..2f65340134 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -1758,7 +1758,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * name is included, so that different interfaces yield different addresses. * * The '$' character is treated special to perform dynamic substitutions - * at runtime. Currently supported are "${CONNECTION}", "${DEVICE}", "${MAC}", + * at runtime. Currently, supported are "${CONNECTION}", "${DEVICE}", "${MAC}", * "${BOOT}", "${RANDOM}". * These effectively create unique IDs per-connection, per-device, per-boot, * or every time. Note that "${DEVICE}" corresponds to the interface name of the @@ -2128,7 +2128,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * NMSettingConnection:secondaries: * * List of connection UUIDs that should be activated when the base - * connection itself is activated. Currently only VPN connections are + * connection itself is activated. Currently, only VPN connections are * supported. **/ /* ---ifcfg-rh--- @@ -2222,7 +2222,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * to use a global default. If the global default is not set, the authentication * retries for 3 times before failing the connection. * - * Currently this only applies to 802-1x authentication. + * Currently, this only applies to 802-1x authentication. * * Since: 1.10 **/ @@ -2252,7 +2252,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * If unspecified, "default" ultimately depends on the DNS plugin (which * for systemd-resolved currently means "no"). * - * This feature requires a plugin which supports mDNS. Otherwise the + * This feature requires a plugin which supports mDNS. Otherwise, the * setting has no effect. One such plugin is dns-systemd-resolved. * * Since: 1.12 @@ -2287,7 +2287,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass) * If unspecified, "default" ultimately depends on the DNS plugin (which * for systemd-resolved currently means "yes"). * - * This feature requires a plugin which supports LLMNR. Otherwise the + * This feature requires a plugin which supports LLMNR. Otherwise, the * setting has no effect. One such plugin is dns-systemd-resolved. * * Since: 1.14 diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c index bfce580eda..777f1feebe 100644 --- a/libnm-core/nm-setting-infiniband.c +++ b/libnm-core/nm-setting-infiniband.c @@ -97,7 +97,7 @@ nm_setting_infiniband_get_transport_mode (NMSettingInfiniband *setting) * @setting: the #NMSettingInfiniband * * Returns the P_Key to use for this device. A value of -1 means to - * use the default P_Key (aka "the P_Key at index 0"). Otherwise it is + * use the default P_Key (aka "the P_Key at index 0"). Otherwise, it is * a 16-bit unsigned integer. * * Returns: the IPoIB P_Key @@ -448,7 +448,7 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *klass) * NMSettingInfiniband:p-key: * * The InfiniBand P_Key to use for this device. A value of -1 means to use - * the default P_Key (aka "the P_Key at index 0"). Otherwise it is a 16-bit + * the default P_Key (aka "the P_Key at index 0"). Otherwise, it is a 16-bit * unsigned integer, whose high bit is set if it is a "full membership" * P_Key. **/ diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index c377452170..9ed3d66d63 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -746,7 +746,7 @@ nm_ip_route_unref (NMIPRoute *route) * nm_ip_route_equal_full: * @route: the #NMIPRoute * @other: the #NMIPRoute to compare @route to. - * @cmp_flags: tune how to compare attributes. Currently only + * @cmp_flags: tune how to compare attributes. Currently, only * NM_IP_ROUTE_EQUAL_CMP_FLAGS_NONE (0) and NM_IP_ROUTE_EQUAL_CMP_FLAGS_WITH_ATTRS (1) * is supported. * @@ -3031,7 +3031,7 @@ _rr_string_addr_family_from_flags (NMIPRoutingRuleAsStringFlags to_string_flags) * @to_string_flags: #NMIPRoutingRuleAsStringFlags for controlling the * string conversion. * @extra_args: (allow-none): extra arguments for controlling the string - * conversion. Currently not extra arguments are supported. + * conversion. Currently, not extra arguments are supported. * @error: (allow-none) (out): the error reason. * * Returns: (transfer full): the new #NMIPRoutingRule or %NULL on error. @@ -3445,7 +3445,7 @@ _rr_string_append_inet_addr (NMStrBuf *str, * @to_string_flags: #NMIPRoutingRuleAsStringFlags for controlling the * string conversion. * @extra_args: (allow-none): extra arguments for controlling the string - * conversion. Currently not extra arguments are supported. + * conversion. Currently, not extra arguments are supported. * @error: (allow-none) (out): the error reason. * * Returns: (transfer full): the string representation or %NULL on error. @@ -5977,7 +5977,7 @@ nm_setting_ip_config_class_init (NMSettingIPConfigClass *klass) * * Flags for the DHCP hostname and FQDN. * - * Currently this property only includes flags to control the FQDN flags + * Currently, this property only includes flags to control the FQDN flags * set in the DHCP FQDN option. Supported FQDN flags are * %NM_DHCP_HOSTNAME_FLAG_FQDN_SERV_UPDATE, * %NM_DHCP_HOSTNAME_FLAG_FQDN_ENCODED and diff --git a/libnm-core/nm-setting-ip-tunnel.c b/libnm-core/nm-setting-ip-tunnel.c index 5db2dde59b..543fd4366c 100644 --- a/libnm-core/nm-setting-ip-tunnel.c +++ b/libnm-core/nm-setting-ip-tunnel.c @@ -816,7 +816,7 @@ nm_setting_ip_tunnel_class_init (NMSettingIPTunnelClass *klass) /** * NMSettingIPTunnel:flags: * - * Tunnel flags. Currently the following values are supported: + * Tunnel flags. Currently, the following values are supported: * %NM_IP_TUNNEL_FLAG_IP6_IGN_ENCAP_LIMIT, %NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_TCLASS, * %NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FLOWLABEL, %NM_IP_TUNNEL_FLAG_IP6_MIP6_DEV, * %NM_IP_TUNNEL_FLAG_IP6_RCV_DSCP_COPY, %NM_IP_TUNNEL_FLAG_IP6_USE_ORIG_FWMARK. diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index 31c822202b..b8e0f8e3cb 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -197,7 +197,7 @@ verify (NMSetting *setting, NMConnection *connection, GError **error) if ( NM_FLAGS_ANY (nm_setting_ip_config_get_dhcp_hostname_flags (s_ip), NM_DHCP_HOSTNAME_FLAGS_FQDN_MASK) && !priv->dhcp_fqdn) { - /* Currently we send a FQDN option only when ipv4.dhcp-fqdn is set */ + /* Currently, we send a FQDN option only when ipv4.dhcp-fqdn is set */ g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, diff --git a/libnm-core/nm-setting-sriov.c b/libnm-core/nm-setting-sriov.c index 3c52dc6cc8..70d4bac81a 100644 --- a/libnm-core/nm-setting-sriov.c +++ b/libnm-core/nm-setting-sriov.c @@ -1305,7 +1305,7 @@ nm_setting_sriov_class_init (NMSettingSriovClass *klass) * "2 mac=00:11:22:33:44:55 spoof-check=true". * * Multiple VFs can be specified using a comma as separator. - * Currently the following attributes are supported: mac, + * Currently, the following attributes are supported: mac, * spoof-check, trust, min-tx-rate, max-tx-rate, vlans. * * The "vlans" attribute is represented as a semicolon-separated diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index b4bbdd644e..5270a36ab1 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -272,7 +272,7 @@ nm_setting_vlan_get_num_priorities (NMSettingVlan *setting, NMVlanPriorityMap ma * Retrieve one of the entries of the #NMSettingVlan:ingress_priority_map * or #NMSettingVlan:egress_priority_map properties of this setting. * - * Returns: returns %TRUE if @idx is in range. Otherwise %FALSE. + * Returns: returns %TRUE if @idx is in range. Otherwise, %FALSE. **/ gboolean nm_setting_vlan_get_priority (NMSettingVlan *setting, diff --git a/libnm-core/nm-setting-wifi-p2p.c b/libnm-core/nm-setting-wifi-p2p.c index 065f6e327f..97f0a87d93 100644 --- a/libnm-core/nm-setting-wifi-p2p.c +++ b/libnm-core/nm-setting-wifi-p2p.c @@ -240,7 +240,7 @@ nm_setting_wifi_p2p_class_init (NMSettingWifiP2PClass *setting_wifi_p2p_class) /** * NMSettingWifiP2P:peer: * - * The P2P device that should be connected to. Currently this is the only + * The P2P device that should be connected to. Currently, this is the only * way to create or join a group. * * Since: 1.16 diff --git a/libnm-core/nm-setting-wireguard.c b/libnm-core/nm-setting-wireguard.c index 2bd633cecb..579431ab2d 100644 --- a/libnm-core/nm-setting-wireguard.c +++ b/libnm-core/nm-setting-wireguard.c @@ -737,9 +737,9 @@ nm_wireguard_peer_remove_allowed_ip (NMWireGuardPeer *self, * nm_wireguard_peer_is_valid: * @self: the #NMWireGuardPeer instance * @check_secrets: if %TRUE, non-secret properties are validated. - * Otherwise they are ignored for this purpose. + * Otherwise, they are ignored for this purpose. * @check_non_secrets: if %TRUE, secret properties are validated. - * Otherwise they are ignored for this purpose. + * Otherwise, they are ignored for this purpose. * @error: the #GError location for returning the failure reason. * * Returns: %TRUE if the peer is valid or fails with an error @@ -2458,7 +2458,7 @@ nm_setting_wireguard_class_init (NMSettingWireGuardClass *klass) * NMSettingWireGuard:fwmark: * * The use of fwmark is optional and is by default off. Setting it to 0 - * disables it. Otherwise it is a 32-bit fwmark for outgoing packets. + * disables it. Otherwise, it is a 32-bit fwmark for outgoing packets. * * Note that "ip4-auto-default-route" or "ip6-auto-default-route" enabled, * implies to automatically choose a fwmark. diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c index dfb2bed958..06c3d988ee 100644 --- a/libnm-core/nm-setting.c +++ b/libnm-core/nm-setting.c @@ -2661,7 +2661,7 @@ nm_setting_option_get_uint32 (NMSetting *setting, * * Note that not all setting types support options. It is a bug * setting a variant to a setting that doesn't support it. - * Currently only #NMSettingEthtool supports it. + * Currently, only #NMSettingEthtool supports it. * * Since: 1.26 */ diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c index ade2edbe73..3a38c2a50c 100644 --- a/libnm/nm-active-connection.c +++ b/libnm/nm-active-connection.c @@ -158,7 +158,7 @@ nm_active_connection_get_connection_type (NMActiveConnection *connection) * * Gets the path of the "specific object" used at activation. * - * Currently there is no single method that will allow you to automatically turn + * Currently, there is no single method that will allow you to automatically turn * this into an appropriate #NMObject; you need to know what kind of object it * is based on other information. (Eg, if @connection corresponds to a Wi-Fi * connection, then the specific object will be an #NMAccessPoint, and you can diff --git a/libnm/nm-client.c b/libnm/nm-client.c index d7f61152dc..48e555599a 100644 --- a/libnm/nm-client.c +++ b/libnm/nm-client.c @@ -2580,7 +2580,7 @@ _obj_handle_dbus_iface_changes (NMClient *self, nm_assert (db_prop_data < &db_iface_data->prop_datas[db_iface_data->dbus_iface.meta->n_dbus_properties]); nm_assert (db_prop_data->prop_data_value); - /* Currently NMLDBusObject forgets about the variant. Theoretically, it could cache + /* Currently, NMLDBusObject forgets about the variant. Theoretically, it could cache * it, but there is no need because we update the property in nmobj (which extracts and * keeps the property value itself). * @@ -5235,7 +5235,7 @@ nm_client_add_and_activate_connection_finish (NMClient *client, * track the activation to its completion. * * This is identical to nm_client_add_and_activate_connection_async() but takes - * a further @options parameter. Currently the following options are supported + * a further @options parameter. Currently, the following options are supported * by the daemon: * * "persist": A string describing how the connection should be stored. * The default is "disk", but it can be modified to "memory" (until @@ -5274,7 +5274,7 @@ nm_client_add_and_activate_connection2 (NMClient *client, * @result: the result passed to the #GAsyncReadyCallback * @error: location for a #GError, or %NULL * @out_result: (allow-none) (transfer full): the output result - * of type "a{sv}" returned by D-Bus' AddAndActivate2 call. Currently no + * of type "a{sv}" returned by D-Bus' AddAndActivate2 call. Currently, no * output is implemented yet. * * Gets the result of a call to nm_client_add_and_activate_connection2(). diff --git a/libnm/nm-device.c b/libnm/nm-device.c index daa23c763d..7dbaf370f3 100644 --- a/libnm/nm-device.c +++ b/libnm/nm-device.c @@ -2315,7 +2315,7 @@ nm_device_reapply_finish (NMDevice *device, /** * nm_device_get_applied_connection: * @device: a #NMDevice - * @flags: the flags argument. Currently this value must always be zero. + * @flags: the flags argument. Currently, this value must always be zero. * @version_id: (out) (allow-none): returns the current version id of * the applied connection * @cancellable: a #GCancellable, or %NULL @@ -2379,7 +2379,7 @@ nm_device_get_applied_connection (NMDevice *device, /** * nm_device_get_applied_connection_async: * @device: a #NMDevice - * @flags: the flags argument. Currently this value must always be zero. + * @flags: the flags argument. Currently, this value must always be zero. * @cancellable: a #GCancellable, or %NULL * @callback: callback to be called when the reapply operation completes * @user_data: caller-specific data passed to @callback diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 5241b4d52f..cb1d4d9337 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -403,7 +403,7 @@ no-auto-default=* <term><varname>debug</varname></term> <listitem><para>Comma separated list of options to aid debugging. This value will be combined with the environment - variable <literal>NM_DEBUG</literal>. Currently the following + variable <literal>NM_DEBUG</literal>. Currently, the following values are supported:</para> <para> <literal>RLIMIT_CORE</literal>: set ulimit -c unlimited @@ -478,7 +478,7 @@ no-auto-default=* <listitem><para>Set devices that should be ignored by NetworkManager. </para> - <para>See <xref linkend="device-spec"/> for the syntax how to + <para>See <xref linkend="device-spec"/> for the syntax on how to specify a device. </para> <para> @@ -1031,7 +1031,7 @@ managed=1 <term><varname>wifi.backend</varname></term> <listitem> <para> - Specify the Wi-Fi backend used for the device. Currently supported + Specify the Wi-Fi backend used for the device. Currently, supported are <literal>wpa_supplicant</literal> and <literal>iwd</literal> (experimental). </para> </listitem> @@ -1048,7 +1048,7 @@ managed=1 </listitem> </varlistentry> <varlistentry id="sriov-num-vfs"> - <term><varname>sriov-num-vfs</varname></term> + , <term><varname>sriov-num-vfs</varname></term> <listitem> <para> Specify the number of virtual functions (VF) to enable diff --git a/man/nmcli-examples.xml b/man/nmcli-examples.xml index a4dfc3d75c..5744ad12bb 100644 --- a/man/nmcli-examples.xml +++ b/man/nmcli-examples.xml @@ -222,7 +222,7 @@ B,DISPATCH</screen> change the configuration with <emphasis>modify</emphasis> command (<emphasis role="bold">nmcli con modify Team1 team.config team1-master-another-json.conf</emphasis>). The last two commands add slaves profiles, both enslaved to <emphasis>Team1</emphasis>. - The first slave will be bound to <emphasis>em1</emphasis> interface, the second to + The first slave will be bound to the <emphasis>em1</emphasis> interface, the second to <emphasis>em2</emphasis>. The slaves don't specify <emphasis>config</emphasis> and thus <emphasis>teamd</emphasis> will use its default configuration. You will activate the whole setup by activating both slaves: @@ -302,7 +302,7 @@ IP4:192.168.1.12/24:192.168.1.1::192.168.1.1::</screen> VF is configured with MAC address 00:11:22:33:44:55 and VLAN 10, the second one has the <emphasis>trust</emphasis> and <emphasis>spoof-check</emphasis> features respectively enabled - and disabled. VF number 2 has a maximux transmission rate of + and disabled. VF number 2 has a maximum transmission rate of 20Mbps. The kernel is instructed to not automatically instantiate a network interface for the VFs. </para> diff --git a/man/nmcli.xml b/man/nmcli.xml index fdc79ad482..a9dc513086 100644 --- a/man/nmcli.xml +++ b/man/nmcli.xml @@ -1506,7 +1506,7 @@ <term><option>private</option></term> <listitem> <para>if set to <literal>yes</literal>, the connection will only be visible - to the user who created it. Otherwise the connection is system-wide, which is + to the user who created it. Otherwise, the connection is system-wide, which is the default.</para> </listitem> </varlistentry> @@ -1514,7 +1514,7 @@ <term><option>hidden</option></term> <listitem> <para>set to <literal>yes</literal> when connecting for the first time to an - AP not broadcasting its SSID. Otherwise the SSID would not be found and the + AP not broadcasting its SSID. Otherwise, the SSID would not be found and the connection attempt would fail.</para> </listitem> </varlistentry> diff --git a/shared/n-dhcp4/src/n-dhcp4-client.c b/shared/n-dhcp4/src/n-dhcp4-client.c index 403a693247..5d0ccf9a0e 100644 --- a/shared/n-dhcp4/src/n-dhcp4-client.c +++ b/shared/n-dhcp4/src/n-dhcp4-client.c @@ -549,7 +549,7 @@ void n_dhcp4_log_queue_fmt(NDhcp4LogQueue *log_queue, if (level > log_queue->log_level) return; - /* Currently the logging queue is only implemented for + /* Currently, the logging queue is only implemented for * the client. Nobody would enable logging except a * client instance. */ c_assert(log_queue->is_client); diff --git a/shared/nm-glib-aux/nm-io-utils.c b/shared/nm-glib-aux/nm-io-utils.c index 776c63e111..81c6ad3510 100644 --- a/shared/nm-glib-aux/nm-io-utils.c +++ b/shared/nm-glib-aux/nm-io-utils.c @@ -357,7 +357,7 @@ nm_utils_file_set_contents (const char *filename, /* If the final destination exists and is > 0 bytes, we want to sync the * newly written file to ensure the data is on disk when we rename over - * the destination. Otherwise if we get a system crash we can lose both + * the destination. Otherwise, if we get a system crash we can lose both * the new and the old file on some filesystems. (I.E. those that don't * guarantee the data is written to the disk before the metadata.) */ diff --git a/shared/nm-glib-aux/nm-shared-utils.c b/shared/nm-glib-aux/nm-shared-utils.c index 9fc4e510ac..120b8bea08 100644 --- a/shared/nm-glib-aux/nm-shared-utils.c +++ b/shared/nm-glib-aux/nm-shared-utils.c @@ -3358,7 +3358,7 @@ nm_utils_strv_make_deep_copied_n (const char **strv, gsize len) * * Note that if @len is non-negative, then it still must not * contain any %NULL pointers within the first @len elements. - * Otherwise you would leak elements if you try to free the + * Otherwise, you would leak elements if you try to free the * array with g_strfreev(). Allowing that would be error prone. * * Returns: (transfer full): a clone of the strv array. Always @@ -4983,7 +4983,7 @@ _nm_str_buf_ensure_size (NMStrBuf *strbuf, { _nm_str_buf_assert (strbuf); - /* Currently this only supports strictly growing the buffer. */ + /* Currently, this only supports strictly growing the buffer. */ nm_assert (new_size > strbuf->_priv_allocated); if (!reserve_exact) { diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index bcb12a564d..7eaffb7dfc 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -96,7 +96,7 @@ get_new_connection_name (NMConnection *const*existing_connections, if (preferred) return g_strdup (preferred); - /* Otherwise find the next available unique connection name using the given + /* Otherwise, find the next available unique connection name using the given * connection name template. */ for (i = 1; TRUE; i++) { @@ -1096,7 +1096,7 @@ nm_shutdown_wait_obj_unregister (NMShutdownWaitObjHandle *handle) * clearly a directory). * * Returns: if @abs_filename is a file inside @abs_path, returns the - * trailing part of @abs_filename which is the filename. Otherwise + * trailing part of @abs_filename which is the filename. Otherwise, * %NULL. */ const char * diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c index 9e7601f005..3cc2492c39 100644 --- a/src/devices/nm-device-ethernet.c +++ b/src/devices/nm-device-ethernet.c @@ -1007,7 +1007,7 @@ act_stage1_prepare (NMDevice *device, NMDeviceStateReason *out_failure_reason) /* If we're re-activating a PPPoE connection a short while after * a previous PPPoE connection was torn down, wait a bit to allow the - * remote side to handle the disconnection. Otherwise the peer may + * remote side to handle the disconnection. Otherwise, the peer may * get confused and fail to negotiate the new connection. (rh #1023503) * * FIXME(shutdown): when exiting, we also need to wait before quiting, diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 65262cda25..15bcf3a640 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5003,7 +5003,7 @@ realize_start_setup (NMDevice *self, is_unmanaged_external_down (self, TRUE)); /* Unmanaged the loopback device with an explicit NM_UNMANAGED_BY_TYPE flag. - * Later we might want to manage 'lo' too. Currently that doesn't work because + * Later we might want to manage 'lo' too. Currently, that doesn't work because * NetworkManager might down the interface or remove the 127.0.0.1 address. */ nm_device_set_unmanaged_flags (self, NM_UNMANAGED_BY_TYPE, @@ -5494,7 +5494,7 @@ nm_device_is_master (NMDevice *self) * @self: the device * * If @self has been enslaved by another device, this returns that - * device. Otherwise it returns %NULL. (In particular, note that if + * device. Otherwise, it returns %NULL. (In particular, note that if * @self is in the process of activating as a slave, but has not yet * been enslaved by its master, this will return %NULL.) * @@ -14877,7 +14877,7 @@ nm_device_update_metered (NMDevice *self) value = NM_METERED_GUESS_YES; } - /* Otherwise look at connection type. For Bluetooth, we look at the type of + /* Otherwise, look at connection type. For Bluetooth, we look at the type of * Bluetooth sharing: for PANU/DUN (where we are receiving internet from * another device) we set GUESS_YES; for NAP (where we are sharing internet * to another device) we set GUESS_NO. We ignore WiMAX here as it’s no diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c index e1865f9dea..a2ed775a84 100644 --- a/src/devices/ovs/nm-ovsdb.c +++ b/src/devices/ovs/nm-ovsdb.c @@ -1012,7 +1012,7 @@ ovsdb_got_update (NMOvsdb *self, json_t *msg) ovs_interface->connection_uuid ? ", " : "", ovs_interface->connection_uuid ?: ""); if (g_strcmp0 (ovs_interface->type, "internal") == 0) { - /* Currently the factory only creates NMDevices for + /* Currently, the factory only creates NMDevices for * internal interfaces. Ignore the rest. */ g_signal_emit (self, signals[DEVICE_REMOVED], 0, ovs_interface->name, NM_DEVICE_TYPE_OVS_INTERFACE); @@ -1037,7 +1037,7 @@ ovsdb_got_update (NMOvsdb *self, json_t *msg) ovs_interface->connection_uuid ? ", " : "", ovs_interface->connection_uuid ?: ""); if (g_strcmp0 (ovs_interface->type, "internal") == 0) { - /* Currently the factory only creates NMDevices for + /* Currently, the factory only creates NMDevices for * internal interfaces. Ignore the rest. */ g_signal_emit (self, signals[DEVICE_ADDED], 0, ovs_interface->name, NM_DEVICE_TYPE_OVS_INTERFACE); diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c index 4b57fa380b..bb493c9f26 100644 --- a/src/devices/wifi/nm-device-iwd.c +++ b/src/devices/wifi/nm-device-iwd.c @@ -1110,7 +1110,7 @@ check_scanning_prohibited (NMDeviceIwd *self, gboolean periodic) * * Check if the connection settings already have the secrets corresponding * to the IWD agent method that was invoked. If they do, send the method reply - * with the appropriate secrets. Otherwise return the missing secret's setting + * with the appropriate secrets. Otherwise, return the missing secret's setting * name and key so the caller can send a NM secrets request with this data. * Return TRUE in either case, return FALSE if an error is detected. */ @@ -2140,7 +2140,7 @@ state_changed (NMDeviceIwd *self, const char *new_state) if (NM_IN_STRSET (new_state, "connecting", "connected", "roaming")) { /* If we were connecting, do nothing, the confirmation of * a connection success is handled in the Device.Connect - * method return callback. Otherwise IWD must have connected + * method return callback. Otherwise, IWD must have connected * without Network Manager's will so for simplicity force a * disconnect. */ diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c index 3872a39efb..d6de33308a 100644 --- a/src/devices/wifi/nm-device-wifi.c +++ b/src/devices/wifi/nm-device-wifi.c @@ -2460,7 +2460,7 @@ supplicant_iface_state (NMDeviceWifi *self, break; } - /* Otherwise it might be a stupid driver or some transient error, so + /* Otherwise, it might be a stupid driver or some transient error, so * let the supplicant try to reconnect a few more times. Give it more * time if a scan is in progress since the link might be dropped during * the scan but will be re-established when the scan is done. diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c index 76fc1a898d..1bd8d0ee71 100644 --- a/src/dhcp/nm-dhcp-dhclient-utils.c +++ b/src/dhcp/nm-dhcp-dhclient-utils.c @@ -404,7 +404,7 @@ nm_dhcp_dhclient_create_config (const char *interface, if (client_id) continue; - /* Otherwise capture and return the existing client id */ + /* Otherwise, capture and return the existing client id */ if (out_new_client_id) nm_clear_pointer (out_new_client_id, g_bytes_unref); NM_SET_OUT (out_new_client_id, read_client_id (p)); diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c index 4ad056e548..ad8fc57bb1 100644 --- a/src/dhcp/nm-dhcp-dhclient.c +++ b/src/dhcp/nm-dhcp-dhclient.c @@ -627,7 +627,7 @@ get_duid (NMDhcpClient *client) return duid; } - /* Otherwise read the default machine-wide DUID */ + /* Otherwise, read the default machine-wide DUID */ _LOGD ("looking for default DUID in '%s'", priv->def_leasefile); duid = nm_dhcp_dhclient_read_duid (priv->def_leasefile, &error); if (error) { diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/ndisc/nm-lndp-ndisc.c index b10adc91f3..25666c2e45 100644 --- a/src/ndisc/nm-lndp-ndisc.c +++ b/src/ndisc/nm-lndp-ndisc.c @@ -122,7 +122,7 @@ receive_ra (struct ndp *ndp, struct ndp_msg *msg, gpointer user_data) /* DHCP level: * * The problem with DHCP level is what to do if subsequent - * router advertisements carry different flags. Currently we just + * router advertisements carry different flags. Currently, we just * rewrite the flag with every inbound RA. */ { diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c index 08037ebe71..a559cda23b 100644 --- a/src/nm-active-connection.c +++ b/src/nm-active-connection.c @@ -751,7 +751,7 @@ nm_active_connection_get_master (NMActiveConnection *self) * @self: the #NMActiveConnection * * Returns: %TRUE if the connection has a master connection, and that - * master connection is ready to accept slaves. Otherwise %FALSE. + * master connection is ready to accept slaves. Otherwise, %FALSE. */ gboolean nm_active_connection_get_master_ready (NMActiveConnection *self) diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c index b9efff4805..d4728a7f33 100644 --- a/src/nm-auth-utils.c +++ b/src/nm-auth-utils.c @@ -280,7 +280,7 @@ nm_auth_chain_set_data_unsafe (NMAuthChain *self, g_return_if_fail (self); g_return_if_fail (tag); - /* The tag must not yet exist. Otherwise we'd have to first search the + /* The tag must not yet exist. Otherwise, we'd have to first search the * list for an existing entry. That usage pattern is not supported. */ nm_assert (!_get_data (self, tag)); diff --git a/src/nm-config.c b/src/nm-config.c index 4fa8531941..e0b9ce3ce7 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -1566,7 +1566,7 @@ intern_config_read (const char *filename, out: /* * If user configuration specifies global DNS options, the DNS - * options in internal configuration must be deleted. Otherwise a + * options in internal configuration must be deleted. Otherwise, a * deletion of options from user configuration may cause the * internal options to appear again. */ diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index f5699b7e95..b6589b678e 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -266,7 +266,7 @@ nm_utils_array_remove_at_indexes (GArray *array, const guint *indexes_to_delete, mm_len++; else { /* we require indexes_to_delete to contain non-repeated, ascending - * indexes. Otherwise we would need to presort the indexes. */ + * indexes. Otherwise, we would need to presort the indexes. */ while (TRUE) { guint dd; @@ -631,7 +631,7 @@ _sleep_duration_convert_ms_to_us (guint32 sleep_duration_msec) * Set to zero, to use the default (meaning 20 wakeups per seconds). * * Kill a child process synchronously and wait. The function first checks if the child already terminated - * and if it did, return the exit status. Otherwise send one @sig signal. @sig will always be + * and if it did, return the exit status. Otherwise, send one @sig signal. @sig will always be * sent unless the child already exited. If the child does not exit within @wait_before_kill_msec milliseconds, * the function will send %SIGKILL and waits for the child indefinitely. If @wait_before_kill_msec is zero, no * %SIGKILL signal will be sent. diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c index 9849656ddd..499a1ec26b 100644 --- a/src/nm-dbus-manager.c +++ b/src/nm-dbus-manager.c @@ -1003,7 +1003,7 @@ _obj_register (NMDBusManager *self, nm_assert (!c_list_is_empty (&obj->internal.registration_lst_head)); - /* Currently the interfaces of an object do not changed and strictly depend on the object glib type. + /* Currently, the interfaces of an object do not changed and strictly depend on the object glib type. * We don't need more flixibility, and it simplifies the code. Hence, now emit interface-added * signal for the new object. * diff --git a/src/nm-manager.c b/src/nm-manager.c index ae78b7c9ce..a67e8ce7ee 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -2364,7 +2364,7 @@ nm_manager_rfkill_update (NMManager *self, RfKillType rtype) if (rtype != RFKILL_TYPE_UNKNOWN) manager_rfkill_update_one_type (self, &priv->radio_states[rtype], rtype); else { - /* Otherwise sync all radio types */ + /* Otherwise, sync all radio types */ for (i = 0; i < RFKILL_TYPE_MAX; i++) manager_rfkill_update_one_type (self, &priv->radio_states[i], i); } @@ -2817,7 +2817,7 @@ recheck_assume_connection (NMManager *self, * We've managed to steal the lease used by initramfs before it * killed off the dhclient. We need to take ownership of the configured * connection and act like the device was configured by us. - * Otherwise the address would just expire. + * Otherwise, the address would just expire. */ _LOG2I (LOGD_DEVICE, device, "assume: taking over an initramfs-configured connection"); activation_type_assume = TRUE; @@ -3774,7 +3774,7 @@ found_better: && g_hash_table_contains (unavailable_devices, device)) continue; - /* determine the priority of this device. Currently this priority is independent + /* determine the priority of this device. Currently, this priority is independent * of the profile (connection) and the device's details (aside the state). * * Maybe nm_device_check_connection_available() should instead return a priority, @@ -5367,7 +5367,7 @@ impl_manager_activate_connection (NMDBusObject *obj, device_path = nm_dbus_path_not_empty (device_path); /* If the connection path is given and valid, that connection is activated. - * Otherwise the "best" connection for the device is chosen and activated, + * Otherwise, the "best" connection for the device is chosen and activated, * regardless of whether that connection is autoconnect-enabled or not * (since this is an explicit request, not an auto-activation request). */ diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 710a6f91f1..57682e9f77 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -514,7 +514,7 @@ G_DEFINE_TYPE (NMLinuxPlatform, nm_linux_platform, NM_TYPE_PLATFORM) /* The %m format specifier (GNU extension) would already allow you to specify the error * message conveniently (and nm_log would get that right too). But we don't want to depend * on that, so instead append the message at the end. - * Currently users are expected not to use %m in the format string. */ \ + * Currently, users are expected not to use %m in the format string. */ \ _LOG_print (__level, __domain, __errsv, self, \ _NM_UTILS_MACRO_FIRST (__VA_ARGS__) ": %s (%d)" \ _NM_UTILS_MACRO_REST (__VA_ARGS__), \ diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c index 2e916e9a9b..a30760d916 100644 --- a/src/platform/tests/test-route.c +++ b/src/platform/tests/test-route.c @@ -1504,7 +1504,7 @@ again: objs_sync = g_ptr_array_new_with_free_func ((GDestroyNotify) nmp_object_unref); - /* ensure that priorities are unique. Otherwise it confuses the test, because + /* ensure that priorities are unique. Otherwise, it confuses the test, because * kernel may wrongly be unable to add/delete routes based on a wrong match * (rh#1685816, rh#1685816). */ for (i = 0; i < objs->len; i++) { diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c index 9101484385..4ac223c0c0 100644 --- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c +++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c @@ -338,7 +338,7 @@ make_connection_name (shvarFile *ifcfg, if (name) return name; - /* Otherwise construct a new NAME */ + /* Otherwise, construct a new NAME */ if (!prefix) prefix = "System"; diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c index 933afb2974..c20098cd60 100644 --- a/src/supplicant/nm-supplicant-interface.c +++ b/src/supplicant/nm-supplicant-interface.c @@ -1235,7 +1235,7 @@ parse_capabilities (NMSupplicantInterface *self, GVariant *capabilities) const gint32 WPAS_MAX_SCAN_SSIDS = 16; /* Even if supplicant claims that 20 SSIDs are supported, the Scan request - * still only accepts WPAS_MAX_SCAN_SSIDS SSIDs. Otherwise the D-Bus + * still only accepts WPAS_MAX_SCAN_SSIDS SSIDs. Otherwise, the D-Bus * request will be rejected with "fi.w1.wpa_supplicant1.InvalidArgs" * Body: ('Did not receive correct message arguments.', 'Too many ssids specified. Specify at most four') * */ diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c index 6d995dc489..b5d79c7fb9 100644 --- a/src/vpn/nm-vpn-connection.c +++ b/src/vpn/nm-vpn-connection.c @@ -300,7 +300,7 @@ _get_settings_connection (NMVpnConnection *self, gboolean allow_missing) { NMSettingsConnection *con; - /* Currently we operate on the assumption, that the settings-connection + /* Currently, we operate on the assumption, that the settings-connection * never changes after it is set (though initially, it might be unset). * Later we might want to change that, but then we need fixes here too. */ |