diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index acea865566..bab91dbea3 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -8580,7 +8580,7 @@ device_has_config(NMDevice *self)
  * @self: the master #NMDevice
  * @slave: the slave #NMDevice
  * @connection: the #NMConnection to update with the slave settings
- * @GError: (out): error description
+ * @error: error description
  *
  * Reads the slave configuration for @slave and updates @connection with those
  * properties. This invokes a virtual function on the master device @self.
@@ -16866,7 +16866,7 @@ nm_device_hw_addr_set(NMDevice *self, const char *addr, const char *detail, gboo
  * @hwaddr: (out): the cloned MAC address to set on interface
  * @hwaddr_type: (out): the type of address to set
  * @hwaddr_detail: (out): the detail (origin) of address to set
- * @error: (out): on return, an error or %NULL
+ * @error: on return, an error or %NULL
  *
  * Computes the MAC to be set on a interface. On success, one of the
  * following exclusive conditions are verified:
diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c
index d44e25c02c..b10e78bee3 100644
--- a/src/core/nm-manager.c
+++ b/src/core/nm-manager.c
@@ -3905,7 +3905,7 @@ _device_realize_finish(NMManager *self, NMDevice *device, const NMPlatformLink *
  * add_device:
  * @self: the #NMManager
  * @device: the #NMDevice to add
- * @error: (out): the #GError
+ * @error: the #GError
  *
  * If successful, this function will increase the references count of @device.
  * Callers should decrease the reference count.
diff --git a/src/libnm-core-impl/nm-connection.c b/src/libnm-core-impl/nm-connection.c
index f0bc20aab8..9a7ad1c603 100644
--- a/src/libnm-core-impl/nm-connection.c
+++ b/src/libnm-core-impl/nm-connection.c
@@ -764,8 +764,8 @@ diff_one_connection(NMConnection         *a,
  * @a: a #NMConnection
  * @b: a second #NMConnection to compare with the first
  * @flags: compare flags, e.g. %NM_SETTING_COMPARE_FLAG_EXACT
- * @out_settings: (out) (element-type utf8 GLib.HashTable(utf8,uint32))
- * (optional) (nullable): if the connections differ, on return a hash table
+ * @out_settings: (out) (element-type utf8 GLib.HashTable(utf8,uint32)) (optional) (nullable):
+ * if the connections differ, on return a hash table
  * mapping setting names to second-level GHashTable (utf8 to guint32), which
  * contains the key names that differ mapped to one or more of
  * %NMSettingDiffResult as a bitfield
diff --git a/src/nmcli/connections.c b/src/nmcli/connections.c
index 039876c962..348c72e9a7 100644
--- a/src/nmcli/connections.c
+++ b/src/nmcli/connections.c
@@ -2609,15 +2609,21 @@ get_default_active_connection(NmCli *nmc, NMDevice **device)
     return default_ac;
 }
 
-/* Find a device to activate the connection on.
- * IN:  connection:  connection to activate
- *      iface:       device interface name to use (optional)
- *      ap:          access point to use (optional; valid just for 802-11-wireless)
- *      nsp:         Network Service Provider to use (option; valid only for wimax)
- * OUT: device:      found device
- *      spec_object: specific_object path of NMAccessPoint
- * RETURNS: TRUE when a device is found, FALSE otherwise.
- */
+/**
+ * find_device_for_connection:
+ * @nmc: the #NmCli
+ * @connection: connection to activate
+ * @iface: device interface name to use (optional)
+ * @ap: access point to use (optional; valid just for 802-11-wireless)
+ * @nsp: Network Service Provider to use (option; valid only for wimax)
+ * @device: (out): found device
+ * @spec_object: (out): specific_object path of NMAccessPoint
+ * @error: the error reason.
+ *
+ * Find a device to activate the connection on.
+ *
+ * Return: TRUE when a device is found, FALSE otherwise.
+ **/
 static gboolean
 find_device_for_connection(NmCli        *nmc,
                            NMConnection *connection,
@@ -6479,17 +6485,17 @@ should_complete_cmd(const char *line, int end, const char *cmd, int *cw_num, cha
     return ret;
 }
 
-/*
+/**
  * extract_setting_and_property:
- * prompt: (nullable): prompt string, or NULL
- * line: (nullable): line, or NULL
- * setting: (out) (transfer full) (array zero-terminated=1) (optional):
+ * @prompt: (nullable): prompt string, or NULL
+ * @line: (nullable): line, or NULL
+ * @setting: (out) (transfer full) (array zero-terminated=1) (optional):
  *   return location for setting name
- * property: (out) (transfer full) (array zero-terminated=1) (optional):
+ * @property: (out) (transfer full) (array zero-terminated=1) (optional):
  *   return location for property name
  *
  * Extract setting and property names from prompt and/or line.
- */
+ **/
 static void
 extract_setting_and_property(const char *prompt, const char *line, char **setting, char **property)
 {