diff options
| author | Michael Biebl <biebl@debian.org> | 2018-07-25 13:13:04 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-07-25 13:13:04 +0200 |
| commit | 08984bbd9d6c7c8a033c7d1466c25a34bcc21c0d (patch) | |
| tree | 53671bf0bb9d3f465b02a1bc149512a210da34a1 /libnm-glib | |
| parent | 0d06e842e34adca9a743de93979a7432961257c6 (diff) | |
| parent | caf1db9d6fbc056cc6c76a24574890f6c7895f3d (diff) | |
Update upstream source from tag 'upstream/1.12.2'
Update to upstream version '1.12.2' with Debian dir 31e4999680481a4db05a3c008df492a8905a4ab3
Diffstat (limited to 'libnm-glib')
| -rw-r--r-- | libnm-glib/nm-device-bond.c | 4 | ||||
| -rw-r--r-- | libnm-glib/nm-device-bridge.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c index bd5bc216..a4f0f501 100644 --- a/libnm-glib/nm-device-bond.c +++ b/libnm-glib/nm-device-bond.c @@ -134,7 +134,7 @@ nm_device_bond_get_carrier (NMDeviceBond *device) * nm_device_bond_get_slaves: * @device: a #NMDeviceBond * - * Gets the devices currently slaved to @device. + * Gets the devices currently enslaved to @device. * * Returns: (element-type NMDevice): the #GPtrArray containing * #NMDevices that are slaves of @device. This is the internal @@ -333,7 +333,7 @@ nm_device_bond_class_init (NMDeviceBondClass *bond_class) /** * NMDeviceBond:slaves: * - * The devices (#NMDevice) slaved to the bond device. + * The devices (#NMDevice) enslaved to the bond device. * * Since: 0.9.8 **/ diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c index 20d65cfa..d5a2bbbc 100644 --- a/libnm-glib/nm-device-bridge.c +++ b/libnm-glib/nm-device-bridge.c @@ -142,7 +142,7 @@ nm_device_bridge_get_carrier (NMDeviceBridge *device) * nm_device_bridge_get_slaves: * @device: a #NMDeviceBridge * - * Gets the devices currently slaved to @device. + * Gets the devices currently enslaved to @device. * * Returns: (element-type NMDevice): the #GPtrArray containing * #NMDevices that are slaves of @device. This is the internal @@ -345,7 +345,7 @@ nm_device_bridge_class_init (NMDeviceBridgeClass *bridge_class) /** * NMDeviceBridge:slaves: * - * The devices (#NMDevice) slaved to the bridge device. + * The devices (#NMDevice) enslaved to the bridge device. * * Since: 0.9.8 **/ |