summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Fontenelle <rafaelff@gnome.org>2019-01-11 17:07:03 -0200
committerLubomir Rintel <lkundrak@v3.sk>2019-01-24 17:19:44 +0100
commitd81e10942fda8b6cb163fc1d631cd44eb35e3b91 (patch)
treecdd4894d3d618ac5bf9cbc30ecd51fd95287690f
parent3f46542821a3f60cc22185a2d0cb0e9772596a24 (diff)
downloadNetworkManager-d81e10942fda8b6cb163fc1d631cd44eb35e3b91.tar.gz
all: fix misspellings
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/merge_requests/64
-rw-r--r--clients/cli/nmcli.c2
-rwxr-xr-xcontrib/test/modemu.pl2
-rw-r--r--libnm-core/nm-setting-connection.c2
-rw-r--r--libnm-core/nm-setting-wireless-security.h2
-rw-r--r--libnm-core/nm-setting.c6
-rw-r--r--libnm/nm-checkpoint.c2
-rw-r--r--man/nmcli.xml2
-rw-r--r--shared/nm-utils/nm-hash-utils.c2
-rw-r--r--shared/nm-utils/nm-shared-utils.h2
-rw-r--r--shared/systemd/src/basic/fd-util.c2
-rw-r--r--src/devices/nm-device.c4
-rw-r--r--src/devices/nm-device.h4
-rw-r--r--src/dhcp/nm-dhcp-systemd.c2
-rw-r--r--src/ndisc/nm-ndisc.c2
-rw-r--r--src/nm-core-utils.c12
-rw-r--r--src/nm-keep-alive.c4
-rw-r--r--src/nm-manager.c8
-rw-r--r--src/platform/nm-linux-platform.c2
-rw-r--r--src/settings/nm-settings-connection.c2
-rw-r--r--src/supplicant/nm-supplicant-interface.c4
-rw-r--r--src/systemd/src/libsystemd-network/dhcp-identifier.c2
21 files changed, 35 insertions, 35 deletions
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index 7e8477ccd8..6217477cc2 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -256,7 +256,7 @@ usage (void)
" -p, --pretty pretty output\n"
" -s, --show-secrets allow displaying passwords\n"
" -t, --terse terse output\n"
- " -v, --version how program version\n"
+ " -v, --version show program version\n"
" -w, --wait <seconds> set timeout waiting for finishing operations\n"
"\n"
"OBJECT\n"
diff --git a/contrib/test/modemu.pl b/contrib/test/modemu.pl
index 27a4d28a5a..40d157a0a6 100755
--- a/contrib/test/modemu.pl
+++ b/contrib/test/modemu.pl
@@ -252,7 +252,7 @@ Same as above, with a modem name different from default.
=head1 BUGS
Only works on machines with a PCI bus. ModemManager is picky about platform
-devices and accepts PCI and USB busses easily. Which is why pretent to have
+devices and accepts PCI and USB buses easily. Which is why pretent to have
our tty on the PCI root device.
Terminates after a single PPP session. C<pppd> seems to hang up the PTY.
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index a32044d249..0cdb59ceb5 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -1633,7 +1633,7 @@ nm_setting_connection_class_init (NMSettingConnectionClass *klass)
* 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 the the interface name of the
+ * or every time. Note that "${DEVICE}" corresponds 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
diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h
index 2f4b4084e7..c560f348ca 100644
--- a/libnm-core/nm-setting-wireless-security.h
+++ b/libnm-core/nm-setting-wireless-security.h
@@ -100,7 +100,7 @@ typedef enum {
* Configure the use of WPS by a connection while it activates.
*
* Note: prior to 1.16, this was a GEnum type instead of a GFlags type
- * altough, with the same numeric values.
+ * although, with the same numeric values.
*
* Since: 1.10
**/
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index 976f7f0085..a62e31e80d 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -1303,7 +1303,7 @@ _nm_setting_should_compare_secret_property (NMSetting *setting,
* - @other also has the secret flat to be ignored.
*
* This makes the check symmetric (aside the fact that @setting must
- * have the secret while @other may not -- which is asymetric). */
+ * have the secret while @other may not -- which is asymmetric). */
if ( NM_FLAGS_HAS (flags, NM_SETTING_COMPARE_FLAG_IGNORE_AGENT_OWNED_SECRETS)
&& NM_FLAGS_HAS (a_secret_flags, NM_SETTING_SECRET_FLAG_AGENT_OWNED)
&& ( !other
@@ -1602,7 +1602,7 @@ nm_setting_diff (NMSetting *a,
*
* Note that compare_property() called with two settings will ignore secrets
* based on the flags, but it will do so if *both* settings have the flag we
- * look for. So that is symetric behavior and good.
+ * look for. So that is symmetric behavior and good.
*
* But for the purpose of diff(), we do a asymmetric comparison because and
* we want to skip testing the property if setting @a alone indicates to do
@@ -2490,7 +2490,7 @@ _nm_setting_gendata_reset_from_hash (NMSetting *setting,
}
/* let's not bother to find out whether the new hash has any different
- * content the the current gendata. Just replace it. */
+ * content the current gendata. Just replace it. */
g_hash_table_remove_all (gendata->hash);
if (num > 0) {
g_hash_table_iter_init (&iter, new);
diff --git a/libnm/nm-checkpoint.c b/libnm/nm-checkpoint.c
index ce15d087f4..0dde238ebb 100644
--- a/libnm/nm-checkpoint.c
+++ b/libnm/nm-checkpoint.c
@@ -91,7 +91,7 @@ nm_checkpoint_get_created (NMCheckpoint *checkpoint)
* nm_checkpoint_get_rollback_timeout:
* @checkpoint: a #NMCheckpoint
*
- * Gets the the timeout in seconds for automatic rollback.
+ * Gets the timeout in seconds for automatic rollback.
*
* Returns: the rollback timeout.
*
diff --git a/man/nmcli.xml b/man/nmcli.xml
index f092a2e45f..3f123a578a 100644
--- a/man/nmcli.xml
+++ b/man/nmcli.xml
@@ -1445,7 +1445,7 @@
<listitem>
<para>Connect to a Wi-Fi network specified by SSID or BSSID. The command
- finds a matching connnection or creates one and then activates it on a device.
+ finds a matching connection or creates one and then activates it on a device.
This is a command-line counterpart of clicking an SSID in a GUI client. If
a connection for the network already exists, it is possible to bring up
(activate) the existing profile as follows:
diff --git a/shared/nm-utils/nm-hash-utils.c b/shared/nm-utils/nm-hash-utils.c
index 80387c7143..6e728e6b20 100644
--- a/shared/nm-utils/nm-hash-utils.c
+++ b/shared/nm-utils/nm-hash-utils.c
@@ -71,7 +71,7 @@ again:
* the first guint has only the entropy that nm_utils_random_bytes()
* generated for the first 4 bytes and relies on a good random generator.
*
- * The first int is especially intersting for nm_hash_static() below, and we
+ * The first int is especially interesting for nm_hash_static() below, and we
* want to have it all the entropy of t_arr. */
c_siphash_init (&siph_state, t_arr.v8);
c_siphash_append (&siph_state, (const guint8 *) &t_arr, sizeof (t_arr));
diff --git a/shared/nm-utils/nm-shared-utils.h b/shared/nm-utils/nm-shared-utils.h
index e28a5fb2f3..6825bf7709 100644
--- a/shared/nm-utils/nm-shared-utils.h
+++ b/shared/nm-utils/nm-shared-utils.h
@@ -305,7 +305,7 @@ _nm_strndup_a_step (char *s, const char *str, gsize len)
*
* Usually, an inline function nm_strdup_int64() would be enough. However,
* that cannot be used for guint64. So, we would also need nm_strdup_uint64().
- * This causes suble error potential, because the caller needs to ensure to
+ * This causes subtle error potential, because the caller needs to ensure to
* use the right one (and compiler isn't going to help as it silently casts).
*
* Instead, this generic macro is supposed to handle all integers correctly. */
diff --git a/shared/systemd/src/basic/fd-util.c b/shared/systemd/src/basic/fd-util.c
index 8ca1711b5c..e160a28260 100644
--- a/shared/systemd/src/basic/fd-util.c
+++ b/shared/systemd/src/basic/fd-util.c
@@ -365,7 +365,7 @@ int fd_get_path(int fd, char **ret) {
r = readlink_malloc(procfs_path, ret);
if (r == -ENOENT) {
/* ENOENT can mean two things: that the fd does not exist or that /proc is not mounted. Let's make
- * things debuggable and distuingish the two. */
+ * things debuggable and distinguish the two. */
if (access("/proc/self/fd/", F_OK) < 0)
/* /proc is not available or not set up properly, we're most likely in some chroot
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 9ded911cc6..17cc454603 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -1274,7 +1274,7 @@ _get_stable_id (NMDevice *self,
uuid = nm_connection_get_uuid (connection);
/* the cloned-mac-address may be generated based on the stable-id.
- * Thus, at this point, we can only use the permanant MAC address
+ * Thus, at this point, we can only use the permanent MAC address
* as seed. */
hwaddr = nm_device_get_permanent_hw_address_full (self, TRUE, &hwaddr_is_fake);
@@ -8350,7 +8350,7 @@ dhcp6_get_duid (NMDevice *self, NMConnection *connection, GBytes *hwaddr, gboole
/* preferably, we would salt the checksum differently for each @duid type. We missed
* to do that initially, so most types use the DEFAULT_SALT.
*
- * Implemenations that are added later, should use a distinct salt instead,
+ * Implementations that are added later, should use a distinct salt instead,
* like "stable-ll"/"stable-llt" with ARPHRD_INFINIBAND below. */
const guint32 DEFAULT_SALT = 670531087u;
nm_auto_free_checksum GChecksum *sum = NULL;
diff --git a/src/devices/nm-device.h b/src/devices/nm-device.h
index c2e3c474fb..b684e2f943 100644
--- a/src/devices/nm-device.h
+++ b/src/devices/nm-device.h
@@ -183,13 +183,13 @@ typedef enum { /*< skip >*/
_NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_IGNORE_AP = (1L << 2),
/* a device can be marked as unmanaged for various reasons. Some of these reasons
- * are authorative, others not. Non-authoritative reasons can be overruled by
+ * are authoritative, others not. Non-authoritative reasons can be overruled by
* `nmcli device set $DEVICE managed yes`. Also, for an explicit user activation
* request we may want to consider the device as managed. This flag makes devices
* that are unmanaged appear available. */
_NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_OVERRULE_UNMANAGED = (1L << 3),
- /* a collection of flags, that are commonly set for an explict user-request. */
+ /* a collection of flags, that are commonly set for an explicit user-request. */
NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST = _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST
| _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_WAITING_CARRIER
| _NM_DEVICE_CHECK_CON_AVAILABLE_FOR_USER_REQUEST_IGNORE_AP
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
index bcbe916f60..3d93d3ac03 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -479,7 +479,7 @@ lease_to_ip4_config (NMDedupMultiIndex *multi_idx,
add_option (options, dhcp4_requests, SD_DHCP_OPTION_STATIC_ROUTE, str_static->str);
}
- /* FIXME: internal client only supports returing the first router. */
+ /* FIXME: internal client only supports returning the first router. */
if (sd_dhcp_lease_get_router (lease, &a_router) >= 0) {
s = nm_utils_inet4_ntop (a_router.s_addr, addr_str);
LOG_LEASE (LOGD_DHCP4, "gateway %s", s);
diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c
index 2da08c5fc2..038ecb806b 100644
--- a/src/ndisc/nm-ndisc.c
+++ b/src/ndisc/nm-ndisc.c
@@ -442,7 +442,7 @@ nm_ndisc_add_address (NMNDisc *ndisc,
if (from_ra) {
/* RFC4862 5.5.3.d, we find an existing address with the same prefix.
- * (note that all prefixes at this point have implicity length /64). */
+ * (note that all prefixes at this point have implicitly length /64). */
if (memcmp (&item->address, &new->address, 8) == 0) {
existing = item;
break;
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 3047ebc846..38bc25c2fa 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -2459,7 +2459,7 @@ again:
if (nm_utils_host_id_get (&seed_bin, &seed_len)) {
/* we have no valid machine-id. Generate a fake one by hashing
* the secret-key. This key is commonly persisted, so it should be
- * stable accross reboots (despite having a broken system without
+ * stable across reboots (despite having a broken system without
* proper machine-id). */
fake_type = "secret-key";
hash_seed = "ab085f06-b629-46d1-a553-84eeba5683b6";
@@ -2556,7 +2556,7 @@ _host_id_read_timestamp (gboolean use_secret_key_file,
* the secret_key) if we are unable to access the secret_key file in the first place.
*
* Pick a random timestamp from the past two years. Yes, this timestamp
- * is not stable accross restarts, but apparently neither is the host-id
+ * is not stable across restarts, but apparently neither is the host-id
* nor the secret_key itself. */
#define EPOCH_TWO_YEARS (G_GINT64_CONSTANT (2 * 365 * 24 * 3600) * NM_UTILS_NS_PER_SECOND)
@@ -3124,7 +3124,7 @@ nm_utils_stable_id_generated_complete (const char *stable_id_generated)
guint8 buf[NM_UTILS_CHECKSUM_LENGTH_SHA1];
char *base64;
- /* for NM_UTILS_STABLE_TYPE_GENERATED we genererate a possibly long string
+ /* for NM_UTILS_STABLE_TYPE_GENERATED we generate a possibly long string
* by doing text-substitutions in nm_utils_stable_id_parse().
*
* Let's shorten the (possibly) long stable_id to something more compact. */
@@ -3178,7 +3178,7 @@ nm_utils_stable_id_parse (const char *stable_id,
* of ${...} patterns.
*
* At first, it looks a bit like bash parameter substitution.
- * In contrast however, the process is unambigious so that the resulting
+ * In contrast however, the process is unambiguous so that the resulting
* effective id differs if:
* - the original, untranslated stable-id differs
* - or any of the subsitutions differs.
@@ -3581,7 +3581,7 @@ nm_utils_dhcp_client_id_mac (int arp_type,
/**
* nm_utils_create_dhcp_iaid:
* @legacy_unstable_byteorder: legacy behavior is to generate a u32 iaid which
- * is endianness dependant. This is to preserve backward compatibility.
+ * is endianness dependent. This is to preserve backward compatibility.
* For non-legacy behavior, the returned integer is in stable endianness,
* and corresponds to legacy behavior on little endian systems.
* @interface_id: the seed for hashing when generating the ID. Usually,
@@ -3624,7 +3624,7 @@ nm_utils_create_dhcp_iaid (gboolean legacy_unstable_byteorder,
* @legacy_unstable_byteorder: historically, the code would generate a iaid
* dependent on host endianness. This is undesirable, if backward compatibility
* are not a concern, generate stable endianness.
- * @interface_id: a binary identifer that is hashed into the DUID.
+ * @interface_id: a binary identifier that is hashed into the DUID.
* Comonly this is the interface-name, but it may be the MAC address.
* @interface_id_len: the length of @interface_id.
* @machine_id: the binary identifier for the machine. It is hashed
diff --git a/src/nm-keep-alive.c b/src/nm-keep-alive.c
index e601483b96..d34c524cd1 100644
--- a/src/nm-keep-alive.c
+++ b/src/nm-keep-alive.c
@@ -98,7 +98,7 @@ _is_alive (NMKeepAlive *self)
/* the D-Bus client is gone. The only other binding (below) for the connection's
* visibility cannot keep the instance alive.
*
- * As such, a D-Bus client watch is authorative and overrules other conditions (that
+ * As such, a D-Bus client watch is authoritative and overrules other conditions (that
* we have so far). */
return FALSE;
}
@@ -470,7 +470,7 @@ _nm_keep_alive_set_owner (NMKeepAlive *self,
nm_assert (!owner || !priv->owner);
/* optimally, we would take a reference to @owner. But the
- * owner already owns a refrence to the keep-alive, so we cannot
+ * owner already owns a reference to the keep-alive, so we cannot
* just own a reference back.
*
* We could register a weak-pointer here. But instead, declare that
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 127d47a33d..703cb58852 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -2708,7 +2708,7 @@ recheck_assume_connection (NMManager *self,
subject = nm_auth_subject_new_internal ();
- /* Note: the lifetime of the activation connection is always bound to the profiles visiblity
+ /* Note: the lifetime of the activation connection is always bound to the profiles visibility
* via NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY.
*
* This only makes a difference, if the profile actually has "connection.permissions"
@@ -3501,7 +3501,7 @@ nm_manager_get_best_device_for_connection (NMManager *self,
flags = NM_DEVICE_CHECK_CON_AVAILABLE_NONE;
else {
/* if the profile is multi-connect=single, we also consider devices which
- * are marked as unmanaged. And explicit user-request shows sufficent user
+ * are marked as unmanaged. And explicit user-request shows sufficient user
* intent to make the device managed.
* That is also, because we expect that such profile is suitably tied
* to the intended device. So when an unmanaged device matches, the user's
@@ -4421,7 +4421,7 @@ _activation_bind_lifetime_to_profile_visibility (NMAuthSubject *subject)
* logs out, the connection becomes invisible and disconnects.
*
* - the profile at this time could already be invisible (e.g. if the
- * user didn't ceate a proper session (sudo) and manually activates
+ * user didn't create a proper session (sudo) and manually activates
* an invisible profile. In this case, we still want to bind the
* lifetime, and it will disconnect after the user logs in and logs
* out again. NMKeepAlive takes care of that.
@@ -4906,7 +4906,7 @@ fail:
* @activation_type: whether to assume the connection. That is, take over gracefully,
* non-destructible.
* @activation_reason: the reason for activation
- * @initial_state_flags: the inital state flags for the activation.
+ * @initial_state_flags: the initial state flags for the activation.
* @error: return location for an error
*
* Begins a new internally-initiated activation of @sett_conn on @device.
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index 85214ec854..4f6d211518 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -2164,7 +2164,7 @@ _wireguard_read_info (NMPlatform *platform /* used only as logging context */,
nm_assert (wireguard_family_id >= 0);
nm_assert (ifindex > 0);
- _LOGT ("wireguard: fetching infomation for ifindex %d (genl-id %d)...", ifindex, wireguard_family_id);
+ _LOGT ("wireguard: fetching information for ifindex %d (genl-id %d)...", ifindex, wireguard_family_id);
msg = nlmsg_alloc ();
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index 0beb5ea770..e655a11937 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -2777,7 +2777,7 @@ _autoconnect_retries_set (NMSettingsConnection *self,
/* NOTE: the blocked time must be identical for all connections, otherwise
* the tracking of resetting the retry count in NMPolicy needs adjustment
* in _connection_autoconnect_retries_set() (as it would need to re-evaluate
- * the next-timeout everytime a connection gets blocked). */
+ * the next-timeout every time a connection gets blocked). */
priv->autoconnect_retries_blocked_until = nm_utils_get_monotonic_timestamp_s () + AUTOCONNECT_RESET_RETRIES_TIMER;
}
}
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index c30adc58f9..20fe5ef2c5 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -1452,7 +1452,7 @@ p2p_props_changed_cb (GDBusProxy *proxy,
/* We already have the proxy, nothing to do. */
} else if (path && g_strcmp0 (path, "/") != 0) {
if (priv->group_proxy != NULL) {
- _LOGW ("P2P: Unexpected udpate of the group object path");
+ _LOGW ("P2P: Unexpected update of the group object path");
priv->group_proxy_acquired = FALSE;
_notify (self, PROP_P2P_GROUP_JOINED);
_notify (self, PROP_P2P_GROUP_PATH);
@@ -1548,7 +1548,7 @@ p2p_group_started (GDBusProxy *proxy,
}
}
- /* Signal existance of the (new) interface. */
+ /* Signal existence of the (new) interface. */
g_signal_emit (self, signals[GROUP_STARTED], 0, iface);
g_object_unref (iface);
}
diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.c b/src/systemd/src/libsystemd-network/dhcp-identifier.c
index 91f5e1b0c8..6d932c2499 100644
--- a/src/systemd/src/libsystemd-network/dhcp-identifier.c
+++ b/src/systemd/src/libsystemd-network/dhcp-identifier.c
@@ -202,7 +202,7 @@ int dhcp_identifier_set_iaid(
if (legacy_unstable_byteorder)
/* for historical reasons (a bug), the bits were swapped and thus
- * the result was endianness dependant. Preserve that behavior. */
+ * the result was endianness dependent. Preserve that behavior. */
id32 = __bswap_32(id32);
else
/* the fixed behavior returns a stable byte order. Since LE is expected