about summary refs log tree commit diff
path: root/docs/libnm/html/libnm-nm-utils.html
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 /docs/libnm/html/libnm-nm-utils.html
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 'docs/libnm/html/libnm-nm-utils.html')
-rw-r--r--docs/libnm/html/libnm-nm-utils.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/libnm/html/libnm-nm-utils.html b/docs/libnm/html/libnm-nm-utils.html
index bf01858f..f14b001d 100644
--- a/docs/libnm/html/libnm-nm-utils.html
+++ b/docs/libnm/html/libnm-nm-utils.html
@@ -2706,10 +2706,10 @@ general case) work with connections of type <em class="parameter"><code>other_ty
 <em class="parameter"><code>other_type</code></em>
  is a valid type for the parent of a VLAN.</p>
 <p>If <em class="parameter"><code>virtual_type</code></em>
- is a "master" type (eg, <code class="literal">NM_TYPE_SETTING_BRIDGE</code>),
+ is a "controller" type (eg, <code class="literal">NM_TYPE_SETTING_BRIDGE</code>),
 then this checks if <em class="parameter"><code>other_type</code></em>
- is a valid type for a slave of that
-master.</p>
+ is a valid type for a port of that
+controller.</p>
 <p>Note that even if this returns <code class="literal">TRUE</code> it is not guaranteed that
 <span class="emphasis"><em>every</em></span> connection of type <em class="parameter"><code>other_type</code></em>
  is