New upstream version 1.12.2 upstream/1.12.2

1 files changed, 11 insertions, 8 deletions

diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 0ae3da53..d841ca37 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -1907,10 +1907,11 @@ nm_device_is_software (NMDevice *device)
 /**
  * nm_device_reapply:
  * @device: a #NMDevice
- * @connection: the #NMConnection to replace the applied settings with or %NULL to reuse existing
- * @version_id: zero or the expected version id of the applied connection. If specified
- *   and the version id mismatches, the call fails without modification. This allows to
- *   catch concurrent accesses.
+ * @connection: (allow-none): the #NMConnection to replace the applied
+ *   settings with or %NULL to reuse existing
+ * @version_id: zero or the expected version id of the applied connection.
+ *   If specified and the version id mismatches, the call fails without
+ *   modification. This allows to catch concurrent accesses.
  * @flags: always set this to zero
  * @cancellable: a #GCancellable, or %NULL
  * @error: location for a #GError, or %NULL
@@ -1969,10 +1970,12 @@ device_reapply_cb (GObject *proxy,
 /**
  * nm_device_reapply_async:
  * @device: a #NMDevice
- * @connection: the #NMConnection to replace the applied settings with or %NULL to reuse existing
- * @version_id: zero or the expected version id of the applied connection. If specified
- *   and the version id mismatches, the call fails without modification. This allows to
- *   catch concurrent accesses.
+ * @connection: (allow-none): the #NMConnection to replace the applied
+ *   settings with or %NULL to reuse existing
+ * @version_id: zero or the expected version id of the applied
+ *   connection. If specified and the version id mismatches, the call
+ *   fails without modification. This allows to catch concurrent
+ *   accesses.
  * @flags: always set this to zero
  * @cancellable: a #GCancellable, or %NULL
  * @callback: callback to be called when the reapply operation completes