fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-20 07:00:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: fix typos in documentation and comments

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=780199

[thaller@redhat.com: reworded commit message]
This commit is contained in:
Yuri Chornoivan 2017-03-17 15:57:50 +02:00 • committed by Thomas Haller
parent 5022e3b8ee
commit 4c6edb22b7
9 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/server.conf.in
View file

@ -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 # @sysconfdir@/NetworkManager/conf.d will change NetworkManager's
# behavior to what's expected on "traditional UNIX server" type # behavior to what's expected on "traditional UNIX server" type
# deployments. # deployments.

4
libnm-core/nm-setting-8021x.c
View file

@ -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 * property must be set to password used to decrypt the PKCS#<!-- -->12
* certificate and key. When using PKCS#<!-- -->12 files and the path * 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 * 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 * 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 * must be set to the password used to decode the PKCS#<!-- -->12 private
* key and certificate. * 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 * property must be set to password used to decrypt the PKCS#<!-- -->12
* certificate and key. When using PKCS#<!-- -->12 files and the path * 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 * 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 * NUL byte, and as with the blob scheme the
* #NMSetting8021x:phase2-private-key-password property must be set to the * #NMSetting8021x:phase2-private-key-password property must be set to the
* password used to decode the PKCS#<!-- -->12 private key and certificate. * password used to decode the PKCS#<!-- -->12 private key and certificate.

2
libnm-core/nm-setting-macsec.c
View file

@ -251,7 +251,7 @@ verify_macsec_key (const char *key, gboolean cak, GError **error)
g_set_error_literal (error, g_set_error_literal (error,
NM_CONNECTION_ERROR, NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_INVALID_PROPERTY, NM_CONNECTION_ERROR_INVALID_PROPERTY,
_("the key contais non-hexadecimal characters")); _("the key contains non-hexadecimal characters"));
return FALSE; return FALSE;
} }

8
libnm-core/nm-setting-wireless-security.c
View file

@ -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 * by this connection only supports WPA2/RSN, the connection cannot be used
* with the access point. * 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 * protocol list, or %FALSE if it was already in the list
**/ **/
gboolean gboolean
@ -236,7 +236,7 @@ nm_setting_wireless_security_remove_proto (NMSettingWirelessSecurity *setting, g
* *
* Removes a protocol from the allowed protocol list. * 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 gboolean
nm_setting_wireless_security_remove_proto_by_value (NMSettingWirelessSecurity *setting, 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 * Removes an encryption algorithm from the allowed pairwise encryption
* algorithm list. * 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 gboolean
nm_setting_wireless_security_remove_pairwise_by_value (NMSettingWirelessSecurity *setting, 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 * Removes an encryption algorithm from the allowed groupwise encryption
* algorithm list. * 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 gboolean
nm_setting_wireless_security_remove_group_by_value (NMSettingWirelessSecurity *setting, nm_setting_wireless_security_remove_group_by_value (NMSettingWirelessSecurity *setting,

4
libnm-util/nm-setting-8021x.c
View file

@ -3560,7 +3560,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
* #NMSetting8021x:private-key-password property must be set to password * #NMSetting8021x:private-key-password property must be set to password
* used to decrypt the PKCS#<!-- -->12 certificate and key. When using PKCS#<!-- -->12 files * 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 * 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 * 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 * "private-key-password" property must be set to the password used to
* decode the PKCS#<!-- -->12 private key and certificate. * 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 * 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 * 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://" * 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 #NMSetting8021x:phase2-private-key-password property must be set to
* the password used to decode the PKCS#<!-- -->12 private key and certificate. * the password used to decode the PKCS#<!-- -->12 private key and certificate.
* *

8
libnm-util/nm-setting-wireless-security.c
View file

@ -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 * by this connection only supports WPA2/RSN, the connection cannot be used
* with the access point. * 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 * protocol list, or %FALSE if it was already in the list
**/ **/
gboolean gboolean
@ -260,7 +260,7 @@ nm_setting_wireless_security_remove_proto (NMSettingWirelessSecurity *setting, g
* *
* Removes a protocol from the allowed protocol list. * 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 * 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 * Removes an encryption algorithm from the allowed pairwise encryption
* algorithm list. * 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 * 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 * Removes an encryption algorithm from the allowed groupwise encryption
* algorithm list. * 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 * Since: 0.9.10
**/ **/

2
src/devices/nm-device.c
View file

@ -5685,7 +5685,7 @@ connection_requires_carrier (NMConnection *connection)
return TRUE; 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. * used, the connection requires carrier since it will just fail without one.
*/ */
if (ip4_carrier_wanted && !ip6_used) if (ip4_carrier_wanted && !ip6_used)

2
src/settings/nm-agent-manager.c
View file

@ -178,7 +178,7 @@ remove_agent (NMAgentManager *self, const char *owner)
while (g_hash_table_iter_next (&iter, &data, NULL)) while (g_hash_table_iter_next (&iter, &data, NULL))
request_remove_agent ((Request *) data, agent, &pending_reqs); 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 * 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 * 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. * that should be sent to other agent to a temporary list to proceed afterwards.