summary refs log tree commit diff
path: root/docs/libnm/html/NMActiveConnection.html
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2024-08-09 18:57:15 +0200
committerMichael Biebl <biebl@debian.org>2024-08-09 18:57:15 +0200
commite96d74409128c6a977e31f24fad9b267d2feb9a1 (patch)
tree12dad71135c6c291de457568cb973208ea8a0024 /docs/libnm/html/NMActiveConnection.html
parent45a364c60a9d6d34e614c4f1f507c69336ad1e69 (diff)
New upstream version 1.48.8 upstream/1.48.8
Diffstat (limited to 'docs/libnm/html/NMActiveConnection.html')
-rw-r--r--docs/libnm/html/NMActiveConnection.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/libnm/html/NMActiveConnection.html b/docs/libnm/html/NMActiveConnection.html
index 2c9c5215..4e49ea67 100644
--- a/docs/libnm/html/NMActiveConnection.html
+++ b/docs/libnm/html/NMActiveConnection.html
@@ -663,7 +663,7 @@ nm_active_connection_get_master (<em class="parameter"><code><a class="link" hre
 <p><code class="literal">nm_active_connection_get_master</code> has been deprecated since version 1.44 and should not be used in newly-written code.</p>
 <p>Use <a class="link" href="NMActiveConnection.html#nm-active-connection-get-controller" title="nm_active_connection_get_controller ()"><code class="function">nm_active_connection_get_controller()</code></a> instead.</p>
 </div>
-<p>Gets the master <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the connection.</p>
+<p>Gets the controller <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the connection.</p>
 <div class="refsect3">
 <a name="nm-active-connection-get-master.parameters"></a><h4>Parameters</h4>
 <div class="informaltable"><table class="informaltable" width="100%" border="0">
@@ -681,7 +681,7 @@ nm_active_connection_get_master (<em class="parameter"><code><a class="link" hre
 </div>
 <div class="refsect3">
 <a name="nm-active-connection-get-master.returns"></a><h4>Returns</h4>
-<p>the master <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>. </p>
+<p>the controller <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> of the <a class="link" href="NMActiveConnection.html" title="NMActiveConnection"><span class="type">NMActiveConnection</span></a>. </p>
 <p><span class="annotation">[<acronym title="The data is owned by the callee, which is responsible of freeing it."><span class="acronym">transfer none</span></acronym>]</span></p>
 </div>
 </div>
@@ -1111,7 +1111,7 @@ nm_active_connection_get_vpn (<em class="parameter"><code><a class="link" href="
 <div class="refsect2">
 <a name="NMActiveConnection--master"></a><h3>The <code class="literal">“master”</code> property</h3>
 <pre class="programlisting">  “master”                   <a class="link" href="NMDevice.html" title="NMDevice"><span class="type">NMDevice</span></a> *</pre>
-<p>The master device if one exists. Replaced by the "controller" property.</p>
+<p>The controller device if one exists. Replaced by the "controller" property.</p>
 <div class="warning"><p><code class="literal">NMActiveConnection:master</code> has been deprecated since version 1.44 and should not be used in newly-written code.</p></div>
 <p>Owner: NMActiveConnection</p>
 <p>Flags: Read</p>