diff options
-rw-r--r-- | data/server.conf.in | 2 | ||||
-rw-r--r-- | libnm-core/nm-setting-8021x.c | 4 | ||||
-rw-r--r-- | libnm-core/nm-setting-ip-config.c | 2 | ||||
-rw-r--r-- | libnm-core/nm-setting-macsec.c | 2 | ||||
-rw-r--r-- | libnm-core/nm-setting-wireless-security.c | 8 | ||||
-rw-r--r-- | libnm-util/nm-setting-8021x.c | 4 | ||||
-rw-r--r-- | libnm-util/nm-setting-wireless-security.c | 8 | ||||
-rw-r--r-- | src/devices/nm-device.c | 2 | ||||
-rw-r--r-- | src/settings/nm-agent-manager.c | 2 |
9 files changed, 17 insertions, 17 deletions
diff --git a/data/server.conf.in b/data/server.conf.in index a63be5110e..2eac5a12e1 100644 --- a/data/server.conf.in +++ b/data/server.conf.in @@ -1,4 +1,4 @@ -# This configuration file, when placed into into +# This configuration file, when placed into # @sysconfdir@/NetworkManager/conf.d will change NetworkManager's # behavior to what's expected on "traditional UNIX server" type # deployments. diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 208e5b6983..ab0f5c66e2 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -4566,7 +4566,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * property must be set to password used to decrypt the PKCS#<!-- -->12 * certificate and key. When using PKCS#<!-- -->12 files and the path * scheme, this property should be set to the full UTF-8 encoded path of the - * key, prefixed with the string "file://" and and ending with a terminating + * key, prefixed with the string "file://" and ending with a terminating * NUL byte, and as with the blob scheme the "private-key-password" property * must be set to the password used to decode the PKCS#<!-- -->12 private * key and certificate. @@ -4658,7 +4658,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * property must be set to password used to decrypt the PKCS#<!-- -->12 * certificate and key. When using PKCS#<!-- -->12 files and the path * scheme, this property should be set to the full UTF-8 encoded path of the - * key, prefixed with the string "file://" and and ending with a terminating + * key, prefixed with the string "file://" and ending with a terminating * NUL byte, and as with the blob scheme the * #NMSetting8021x:phase2-private-key-password property must be set to the * password used to decode the PKCS#<!-- -->12 private key and certificate. diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c index 6a42133c1e..17d803bbb9 100644 --- a/libnm-core/nm-setting-ip-config.c +++ b/libnm-core/nm-setting-ip-config.c @@ -1267,7 +1267,7 @@ nm_ip_route_attribute_validate (const char *name, g_set_error (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_FAILED, - _("invalid attribute type'%s'"), + _("invalid attribute type '%s'"), g_variant_get_type_string (value)); return FALSE; } diff --git a/libnm-core/nm-setting-macsec.c b/libnm-core/nm-setting-macsec.c index 60df6839f0..c818f07fce 100644 --- a/libnm-core/nm-setting-macsec.c +++ b/libnm-core/nm-setting-macsec.c @@ -251,7 +251,7 @@ verify_macsec_key (const char *key, gboolean cak, GError **error) g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("the key contais non-hexadecimal characters")); + _("the key contains non-hexadecimal characters")); return FALSE; } diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c index f98e9e57ec..70bdf7541d 100644 --- a/libnm-core/nm-setting-wireless-security.c +++ b/libnm-core/nm-setting-wireless-security.c @@ -182,7 +182,7 @@ nm_setting_wireless_security_get_proto (NMSettingWirelessSecurity *setting, guin * by this connection only supports WPA2/RSN, the connection cannot be used * with the access point. * - * Returns: %TRUE if the protocol was new and and was added to the allowed + * Returns: %TRUE if the protocol was new and was added to the allowed * protocol list, or %FALSE if it was already in the list **/ gboolean @@ -236,7 +236,7 @@ nm_setting_wireless_security_remove_proto (NMSettingWirelessSecurity *setting, g * * Removes a protocol from the allowed protocol list. * - * Returns: %TRUE if the protocol was found and removed; %FALSE it it was not. + * Returns: %TRUE if the protocol was found and removed; %FALSE if it was not. **/ gboolean nm_setting_wireless_security_remove_proto_by_value (NMSettingWirelessSecurity *setting, @@ -382,7 +382,7 @@ nm_setting_wireless_security_remove_pairwise (NMSettingWirelessSecurity *setting * Removes an encryption algorithm from the allowed pairwise encryption * algorithm list. * - * Returns: %TRUE if the encryption algorith was found and removed; %FALSE it it was not. + * Returns: %TRUE if the encryption algorith was found and removed; %FALSE if it was not. **/ gboolean nm_setting_wireless_security_remove_pairwise_by_value (NMSettingWirelessSecurity *setting, @@ -530,7 +530,7 @@ nm_setting_wireless_security_remove_group (NMSettingWirelessSecurity *setting, g * Removes an encryption algorithm from the allowed groupwise encryption * algorithm list. * - * Returns: %TRUE if the algorithm was found and removed; %FALSE it it was not. + * Returns: %TRUE if the algorithm was found and removed; %FALSE if it was not. **/ gboolean nm_setting_wireless_security_remove_group_by_value (NMSettingWirelessSecurity *setting, diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index 03165bda37..5cb19818ed 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -3560,7 +3560,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * #NMSetting8021x:private-key-password property must be set to password * used to decrypt the PKCS#<!-- -->12 certificate and key. When using PKCS#<!-- -->12 files * and the path scheme, this property should be set to the full UTF-8 - * encoded path of the key, prefixed with the string "file://" and and + * encoded path of the key, prefixed with the string "file://" and * ending with a terminating NUL byte, and as with the blob scheme the * "private-key-password" property must be set to the password used to * decode the PKCS#<!-- -->12 private key and certificate. @@ -3632,7 +3632,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * password used to decrypt the PKCS#<!-- -->12 certificate and key. When using * PKCS#<!-- -->12 files and the path scheme, this property should be set to the * full UTF-8 encoded path of the key, prefixed with the string "file://" - * and and ending with a terminating NUL byte, and as with the blob scheme + * and ending with a terminating NUL byte, and as with the blob scheme * the #NMSetting8021x:phase2-private-key-password property must be set to * the password used to decode the PKCS#<!-- -->12 private key and certificate. * diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index fd8eb976f1..22808fea7e 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -206,7 +206,7 @@ nm_setting_wireless_security_get_proto (NMSettingWirelessSecurity *setting, guin * by this connection only supports WPA2/RSN, the connection cannot be used * with the access point. * - * Returns: %TRUE if the protocol was new and and was added to the allowed + * Returns: %TRUE if the protocol was new and was added to the allowed * protocol list, or %FALSE if it was already in the list **/ gboolean @@ -260,7 +260,7 @@ nm_setting_wireless_security_remove_proto (NMSettingWirelessSecurity *setting, g * * Removes a protocol from the allowed protocol list. * - * Returns: %TRUE if the protocol was found and removed; %FALSE it it was not. + * Returns: %TRUE if the protocol was found and removed; %FALSE if it was not. * * Since: 0.9.10 **/ @@ -408,7 +408,7 @@ nm_setting_wireless_security_remove_pairwise (NMSettingWirelessSecurity *setting * Removes an encryption algorithm from the allowed pairwise encryption * algorithm list. * - * Returns: %TRUE if the encryption algorith was found and removed; %FALSE it it was not. + * Returns: %TRUE if the encryption algorith was found and removed; %FALSE if it was not. * * Since: 0.9.10 **/ @@ -558,7 +558,7 @@ nm_setting_wireless_security_remove_group (NMSettingWirelessSecurity *setting, g * Removes an encryption algorithm from the allowed groupwise encryption * algorithm list. * - * Returns: %TRUE if the algorithm was found and removed; %FALSE it it was not. + * Returns: %TRUE if the algorithm was found and removed; %FALSE if it was not. * * Since: 0.9.10 **/ diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index 10f870f3ff..0632463605 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -5685,7 +5685,7 @@ connection_requires_carrier (NMConnection *connection) return TRUE; } - /* If an IP version wants a carrier and and the other IP version isn't + /* If an IP version wants a carrier and the other IP version isn't * used, the connection requires carrier since it will just fail without one. */ if (ip4_carrier_wanted && !ip6_used) diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index 0db20979ee..c18faa33a2 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -178,7 +178,7 @@ remove_agent (NMAgentManager *self, const char *owner) while (g_hash_table_iter_next (&iter, &data, NULL)) request_remove_agent ((Request *) data, agent, &pending_reqs); - /* We cannot call request_next_agent() from from within hash iterating loop, + /* We cannot call request_next_agent() from within hash iterating loop, * because it may remove the request from the hash table, which invalidates * the iterator. So, only remove the agent from requests. And store the requests * that should be sent to other agent to a temporary list to proceed afterwards. |