diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2017-05-05 14:11:05 +0200 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-05-05 19:14:19 +0200 |
commit | a4cbfe6f0a1fe19ddf7d98cf7a0e1914fe085aff (patch) | |
tree | 888c38370daa88ff44676cd730d0524c9c91c229 | |
parent | 7ab6df16a7ec9a273756b6185c0dbe9950dcb268 (diff) | |
download | NetworkManager-a4cbfe6f0a1fe19ddf7d98cf7a0e1914fe085aff.tar.gz |
all: fix typo 'entires' -> 'entries'
-rw-r--r-- | libnm-core/nm-setting-connection.c | 4 | ||||
-rw-r--r-- | libnm-core/nm-setting-user.c | 2 | ||||
-rw-r--r-- | libnm-core/nm-setting-vlan.c | 4 | ||||
-rw-r--r-- | libnm-util/nm-setting-connection.c | 4 | ||||
-rw-r--r-- | libnm-util/nm-setting-vlan.c | 4 | ||||
-rw-r--r-- | src/NetworkManagerUtils.c | 2 | ||||
-rw-r--r-- | src/devices/nm-lldp-listener.c | 2 | ||||
-rw-r--r-- | src/nm-config.c | 8 | ||||
-rw-r--r-- | src/nm-core-utils.c | 4 | ||||
-rw-r--r-- | src/platform/nm-linux-platform.c | 2 |
10 files changed, 18 insertions, 18 deletions
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 376da69f4e..38f3bf4480 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -289,10 +289,10 @@ nm_setting_connection_get_connection_type (NMSettingConnection *setting) * nm_setting_connection_get_num_permissions: * @setting: the #NMSettingConnection * - * Returns the number of entires in the #NMSettingConnection:permissions + * Returns the number of entries in the #NMSettingConnection:permissions * property of this setting. * - * Returns: the number of permissions entires + * Returns: the number of permissions entries */ guint32 nm_setting_connection_get_num_permissions (NMSettingConnection *setting) diff --git a/libnm-core/nm-setting-user.c b/libnm-core/nm-setting-user.c index 2ba2eb84a6..9789134b35 100644 --- a/libnm-core/nm-setting-user.c +++ b/libnm-core/nm-setting-user.c @@ -327,7 +327,7 @@ nm_setting_user_set_data (NMSettingUser *setting, if (g_hash_table_size (priv->data) > 256) { /* limit the number of valid keys */ g_set_error_literal (error, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY, - _("maximum number of user data entires reached")); + _("maximum number of user data entries reached")); return FALSE; } diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index bbda72d7bb..de9c5c4874 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -290,7 +290,7 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting, * @setting: the #NMSettingVlan * @map: the type of priority map * - * Returns the number of entires in the + * Returns the number of entries in the * #NMSettingVlan:ingress_priority_map or #NMSettingVlan:egress_priority_map * properties of this setting. * @@ -577,7 +577,7 @@ nm_setting_vlan_remove_priority_str_by_value (NMSettingVlan *setting, * @setting: the #NMSettingVlan * @map: the type of priority map * - * Clear all the entires from #NMSettingVlan:ingress_priority_map or + * Clear all the entries from #NMSettingVlan:ingress_priority_map or * #NMSettingVlan:egress_priority_map properties. */ void diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index e6fe2fe4bf..28d5fca7bf 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -278,10 +278,10 @@ nm_setting_connection_get_connection_type (NMSettingConnection *setting) * nm_setting_connection_get_num_permissions: * @setting: the #NMSettingConnection * - * Returns the number of entires in the #NMSettingConnection:permissions + * Returns the number of entries in the #NMSettingConnection:permissions * property of this setting. * - * Returns: the number of permissions entires + * Returns: the number of permissions entries */ guint32 nm_setting_connection_get_num_permissions (NMSettingConnection *setting) diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index 3437d69772..3cddb3f904 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -286,7 +286,7 @@ nm_setting_vlan_add_priority_str (NMSettingVlan *setting, * @setting: the #NMSettingVlan * @map: the type of priority map * - * Returns the number of entires in the + * Returns the number of entries in the * #NMSettingVlan:ingress_priority_map or #NMSettingVlan:egress_priority_map * properties of this setting. * @@ -499,7 +499,7 @@ nm_setting_vlan_remove_priority_str_by_value (NMSettingVlan *setting, * @setting: the #NMSettingVlan * @map: the type of priority map * - * Clear all the entires from #NMSettingVlan:ingress_priority_map or + * Clear all the entries from #NMSettingVlan:ingress_priority_map or * #NMSettingVlan:egress_priority_map properties. */ void diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 779dc8aaeb..ecb1d8ae7c 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -599,7 +599,7 @@ check_connection_cloned_mac_address (NMConnection *orig, if (s_wired_cand) cand_mac = nm_setting_wired_get_cloned_mac_address (s_wired_cand); - /* special cloned mac address entires are accepted. */ + /* special cloned mac address entries are accepted. */ if (NM_CLONED_MAC_IS_SPECIAL (orig_mac)) orig_mac = NULL; if (NM_CLONED_MAC_IS_SPECIAL (cand_mac)) diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c index ccac2f04b7..bfd631f0fd 100644 --- a/src/devices/nm-lldp-listener.c +++ b/src/devices/nm-lldp-listener.c @@ -697,7 +697,7 @@ process_lldp_neighbor (NMLldpListener *self, sd_lldp_neighbor *neighbor_sd, gboo return; } - /* ensure that we have at most MAX_NEIGHBORS entires */ + /* ensure that we have at most MAX_NEIGHBORS entries */ if ( !neigh_old /* only matters in the "add" case. */ && (g_hash_table_size (priv->lldp_neighbors) + 1 > MAX_NEIGHBORS)) { _LOGT ("process: ignore neighbor due to overall limit of %d", MAX_NEIGHBORS); diff --git a/src/nm-config.c b/src/nm-config.c index 29fa73a2c5..63998b6268 100644 --- a/src/nm-config.c +++ b/src/nm-config.c @@ -571,14 +571,14 @@ _sort_groups_cmp (const char **pa, const char **pb, gpointer dummy) b_is_connection = g_str_has_prefix (b, NM_CONFIG_KEYFILE_GROUPPREFIX_CONNECTION); if (a_is_connection != b_is_connection) { - /* one is a [connection*] entry, the other not. We sort [connection*] entires + /* one is a [connection*] entry, the other not. We sort [connection*] entries * after. */ if (a_is_connection) return 1; return -1; } if (a_is_connection) { - /* both are [connection.\+] entires. Reverse their order. + /* both are [connection.\+] entries. Reverse their order. * One of the sections might be literally [connection]. That section * is special and it's order will be fixed later. It doesn't actually * matter here how it compares with [connection.\+] sections. */ @@ -589,14 +589,14 @@ _sort_groups_cmp (const char **pa, const char **pb, gpointer dummy) b_is_device = g_str_has_prefix (b, NM_CONFIG_KEYFILE_GROUPPREFIX_DEVICE); if (a_is_device != b_is_device) { - /* one is a [device*] entry, the other not. We sort [device*] entires + /* one is a [device*] entry, the other not. We sort [device*] entries * after. */ if (a_is_device) return 1; return -1; } if (a_is_device) { - /* both are [device.\+] entires. Reverse their order. + /* both are [device.\+] entries. Reverse their order. * One of the sections might be literally [device]. That section * is special and it's order will be fixed later. It doesn't actually * matter here how it compares with [device.\+] sections. */ diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c index 567f06c25c..aaaf7b6c9a 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c @@ -1638,7 +1638,7 @@ nm_match_spec_config (const GSList *specs, guint cur_nm_version, const char *env * @value: the string of device specs * * Splits the specs from the string and returns them as individual - * entires in a #GSList. + * entries in a #GSList. * * It does not validate any specs, it basically just does a special * strsplit with ',' or ';' as separators and supporting '\\' as @@ -3910,7 +3910,7 @@ debug_key_matches (const gchar *key, * nm_utils_parse_debug_string: * @string: the string to parse * @keys: the debug keys - * @nkeys: number of entires in @keys + * @nkeys: number of entries in @keys * * Similar to g_parse_debug_string(), but does not special * case "help" or "all". diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 93264809be..252f054d43 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -5290,7 +5290,7 @@ _vlan_change_vlan_qos_mapping_create (gboolean is_ingress_map, if (current_n_map) { if (is_ingress_map) { /* For the ingress-map, there are only 8 entries (0 to 7). - * When the user requests to reset all entires, we don't actually + * When the user requests to reset all entries, we don't actually * need the cached entries, we can just explicitly clear all possible * ones. * |