summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBeniamino Galvani <bgalvani@redhat.com>2018-05-16 09:41:45 +0200
committerBeniamino Galvani <bgalvani@redhat.com>2018-07-11 10:01:09 +0200
commit2223f8de807eaf3d4f7dcdbb79929ebe874a777b (patch)
treedb73d057953a78f920bc0a0c83579df0677cd43b
parent21c30a6b3198713f4059600244415977bdcaee2d (diff)
downloadNetworkManager-2223f8de807eaf3d4f7dcdbb79929ebe874a777b.tar.gz
libnm-core: tc: fix indentation and typo
-rw-r--r--clients/common/settings-docs.h.in2
-rw-r--r--libnm-core/nm-setting-tc-config.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in
index bde1d1900a..30b48a9cf8 100644
--- a/clients/common/settings-docs.h.in
+++ b/clients/common/settings-docs.h.in
@@ -324,7 +324,7 @@
#define DESCRIBE_DOC_NM_SETTING_SERIAL_SEND_DELAY N_("Time to delay between each byte sent to the modem, in microseconds.")
#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_TC_CONFIG_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".")
-#define DESCRIBE_DOC_NM_SETTING_TC_CONFIG_QDISCS N_("Array of TC queuening disciplines.")
+#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.")
#define DESCRIBE_DOC_NM_SETTING_TEAM_LINK_WATCHERS N_("Link watchers configuration for the connection: each link watcher is defined by a dictionary, whose keys depend upon the selected link watcher. Available link watchers are 'ethtool', 'nsna_ping' and 'arp_ping' and it is specified in the dictionary with the key 'name'. Available keys are: ethtool: 'delay-up', 'delay-down', 'init-wait'; nsna_ping: 'init-wait', 'interval', 'missed-max', 'target-host'; arp_ping: all the ones in nsna_ping and 'source-host', 'validate-active', 'validate-incative', 'send-always'. See teamd.conf man for more details.")
diff --git a/libnm-core/nm-setting-tc-config.c b/libnm-core/nm-setting-tc-config.c
index 41db056794..588446e5dd 100644
--- a/libnm-core/nm-setting-tc-config.c
+++ b/libnm-core/nm-setting-tc-config.c
@@ -820,18 +820,18 @@ enum {
/**
* NMSettingTCConfig:
*
- * Linux Traffic Contril Settings.
+ * Linux Traffic Control Settings.
*
* Since: 1.12
*/
struct _NMSettingTCConfig {
- NMSetting parent;
+ NMSetting parent;
GPtrArray *qdiscs;
GPtrArray *tfilters;
};
struct _NMSettingTCConfigClass {
- NMSettingClass parent;
+ NMSettingClass parent;
};
G_DEFINE_TYPE_WITH_CODE (NMSettingTCConfig, nm_setting_tc_config, NM_TYPE_SETTING,
@@ -1606,7 +1606,7 @@ nm_setting_tc_config_class_init (NMSettingTCConfigClass *setting_class)
/**
* NMSettingTCConfig:qdiscs: (type GPtrArray(NMTCQdisc))
*
- * Array of TC queuening disciplines.
+ * Array of TC queueing disciplines.
**/
/* ---ifcfg-rh---
* property: qdiscs