about summary refs log tree commit diff
path: root/src/libnm-client-impl/nm-active-connection.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2024-08-09 18:57:26 +0200
committerMichael Biebl <biebl@debian.org>2024-08-09 18:57:26 +0200
commit5ebc16389d33662f712e49a8d5f3445f6b34ca05 (patch)
treeaf14aec1d1271903e73ef2b45d6b9c6d6c188f44 /src/libnm-client-impl/nm-active-connection.c
parentf07580d7a481ecbc1e90033b7fa5607e0ab2d051 (diff)
parente96d74409128c6a977e31f24fad9b267d2feb9a1 (diff)
Update upstream source from tag 'upstream/1.48.8'
Update to upstream version '1.48.8'
with Debian dir b9f8c1b806c3088cd4a6040531628e5352ccb2ee
Diffstat (limited to 'src/libnm-client-impl/nm-active-connection.c')
-rw-r--r--src/libnm-client-impl/nm-active-connection.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libnm-client-impl/nm-active-connection.c b/src/libnm-client-impl/nm-active-connection.c
index 6a138f3e..0d186361 100644
--- a/src/libnm-client-impl/nm-active-connection.c
+++ b/src/libnm-client-impl/nm-active-connection.c
@@ -381,9 +381,9 @@ nm_active_connection_get_vpn(NMActiveConnection *connection)
  * nm_active_connection_get_master:
  * @connection: a #NMActiveConnection
  *
- * Gets the master #NMDevice of the connection.
+ * Gets the controller #NMDevice of the connection.
  *
- * Returns: (transfer none): the master #NMDevice of the #NMActiveConnection.
+ * Returns: (transfer none): the controller #NMDevice of the #NMActiveConnection.
  *
  * Deprecated: 1.44: Use nm_active_connection_get_controller() instead.
  **/
@@ -880,7 +880,7 @@ nm_active_connection_class_init(NMActiveConnectionClass *klass)
     /**
      * NMActiveConnection:master:
      *
-     * The master device if one exists. Replaced by the "controller" property.
+     * The controller device if one exists. Replaced by the "controller" property.
      *
      * Deprecated: 1.44
      **/