From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001 From: Iain Lane Date: Mon, 24 Sep 2018 09:29:55 +0100 Subject: Import Upstream version 1.12.2 --- libnm/nm-device-bond.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libnm/nm-device-bond.c') diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c index 96334840..83b7c3b4 100644 --- a/libnm/nm-device-bond.c +++ b/libnm/nm-device-bond.c @@ -86,7 +86,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 @@ -248,11 +248,9 @@ nm_device_bond_class_init (NMDeviceBondClass *bond_class) G_PARAM_STATIC_STRINGS)); /** - * NMDeviceBond:slaves: + * NMDeviceBond:slaves: (type GPtrArray(NMDevice)) * - * The devices slaved to the bond device. - * - * Element-type: NMDevice + * The devices enslaved to the bond device. **/ g_object_class_install_property (object_class, PROP_SLAVES, -- cgit 1.3.0-6-gf8a5