diff options
Diffstat (limited to 'docs')
29 files changed, 158 insertions, 138 deletions
diff --git a/docs/api/html/NetworkManager.conf.html b/docs/api/html/NetworkManager.conf.html index 2b79ac84..fcd93162 100644 --- a/docs/api/html/NetworkManager.conf.html +++ b/docs/api/html/NetworkManager.conf.html @@ -224,7 +224,7 @@ no-auto-default=* if specified (See <a class="xref" href="NetworkManager.conf.html#ignore-carrier"><code class="varname">ignore-carrier</code></a>). Otherwise, it is a list of matches to specify for which device carrier should be ignored. See <a class="xref" href="NetworkManager.conf.html#device-spec" title="Device List Format">the section called “Device List Format”</a> for the - syntax how to specify a device. Note that master types like + syntax how to specify a device. Note that controller types like bond, bridge, and team ignore carrier by default. You can however revert that default using the "except:" specifier (or better, use the per-device setting instead of the deprecated setting). @@ -814,10 +814,15 @@ ipv6.ip6-privacy=0 </p></td> </tr> <tr> -<td><p><span class="term"><code class="varname">connection.autoconnect-slaves</code></span></p></td> +<td><p><span class="term"><code class="varname">connection.autoconnect-ports</code></span></p></td> <td></td> </tr> <tr> +<td><p><span class="term"><code class="varname">connection.autoconnect-slaves</code></span></p></td> +<td><p>This is deprecated, please use "connection.autoconnect-ports" instead. + </p></td> +</tr> +<tr> <td><p><span class="term"><code class="varname">connection.down-on-poweroff</code></span></p></td> <td><p>Whether the connection will be brought down before the system is powered off.</p></td> </tr> @@ -1105,7 +1110,7 @@ ipv6.ip6-privacy=0 <pre class="programlisting"> [connection] ipv6.ip6-privacy=0 -connection.autoconnect-slaves=1 +connection.autoconnect-ports=1 vpn.timeout=120 [connection-wifi-wlan0] diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 2102feb9..752eadad 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -823,12 +823,12 @@ <keyword type="constant" name="NM_SETTINGS_CONNECTION_FLAG_VOLATILE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.27.4.2.1.4.4.1.1id-1.4.17.2.27.4.2.1.4.4.1.2"/> <keyword type="constant" name="NM_SETTINGS_CONNECTION_FLAG_EXTERNAL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.27.4.2.1.4.5.1.1id-1.4.17.2.27.4.2.1.4.5.1.2"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.1.1.1id-1.4.17.2.28.4.2.1.4.1.1.2"/> - <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_MASTER" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.2.1.1id-1.4.17.2.28.4.2.1.4.2.1.2"/> - <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_SLAVE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.3.1.1id-1.4.17.2.28.4.2.1.4.3.1.2"/> + <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.2.1.1id-1.4.17.2.28.4.2.1.4.2.1.2"/> + <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_PORT" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.3.1.1id-1.4.17.2.28.4.2.1.4.3.1.2"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_LAYER2_READY" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.4.1.1id-1.4.17.2.28.4.2.1.4.4.1.2"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IP4_READY" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.5.1.1id-1.4.17.2.28.4.2.1.4.5.1.2"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IP6_READY" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.6.1.1id-1.4.17.2.28.4.2.1.4.6.1.2"/> - <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.7.1.1id-1.4.17.2.28.4.2.1.4.7.1.2"/> + <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.7.1.1id-1.4.17.2.28.4.2.1.4.7.1.2"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.8.1.1id-1.4.17.2.28.4.2.1.4.8.1.2"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_EXTERNAL" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.28.4.2.1.4.9.1.1id-1.4.17.2.28.4.2.1.4.9.1.2"/> <keyword type="constant" name="NM_SETTINGS_ADD_CONNECTION2_FLAG_NONE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.29.4.2.1.4.1.1.1id-1.4.17.2.29.4.2.1.4.1.1.2"/> diff --git a/docs/api/html/index.html b/docs/api/html/index.html index cfb63607..0d68746b 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -16,7 +16,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">NetworkManager Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for NetworkManager 1.48.6 + for NetworkManager 1.48.8 The latest version of this documentation can be found on-line at <a class="ulink" href="https://networkmanager.dev/docs/api/latest/" target="_top">https://networkmanager.dev/docs/api/latest/</a>. diff --git a/docs/api/html/nm-dbus-types.html b/docs/api/html/nm-dbus-types.html index 6da92d30..0a4807df 100644 --- a/docs/api/html/nm-dbus-types.html +++ b/docs/api/html/nm-dbus-types.html @@ -520,7 +520,7 @@ <p></p> </td> <td class="enum_member_description"> -<p>a bond master interface</p> +<p>a bond controller interface</p> <p></p> </td> <td class="auto-generated"> </td> @@ -565,7 +565,7 @@ <p></p> </td> <td class="enum_member_description"> -<p>a bridge master interface</p> +<p>a bridge controller interface</p> <p></p> </td> <td class="auto-generated"> </td> @@ -580,7 +580,7 @@ <p></p> </td> <td class="enum_member_description"> -<p>a team master interface</p> +<p>a team controller interface</p> <p></p> </td> <td class="auto-generated"> </td> @@ -4506,7 +4506,7 @@ </tr> <tr> <td class="enum_member_name"> -<p>NM_ACTIVATION_STATE_FLAG_IS_MASTER</p> +<p>NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER</p> <p></p> </td> <td class="enum_member_value"> @@ -4514,14 +4514,14 @@ <p></p> </td> <td class="enum_member_description"> -<p>the device is a master.</p> +<p>the device is a controller.</p> <p></p> </td> <td class="auto-generated"> </td> </tr> <tr> <td class="enum_member_name"> -<p>NM_ACTIVATION_STATE_FLAG_IS_SLAVE</p> +<p>NM_ACTIVATION_STATE_FLAG_IS_PORT</p> <p></p> </td> <td class="enum_member_value"> @@ -4529,7 +4529,7 @@ <p></p> </td> <td class="enum_member_description"> -<p>the device is a slave.</p> +<p>the device is a port.</p> <p></p> </td> <td class="auto-generated"> </td> @@ -4581,7 +4581,7 @@ </tr> <tr> <td class="enum_member_name"> -<p>NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES</p> +<p>NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS</p> <p></p> </td> <td class="enum_member_value"> @@ -4589,7 +4589,7 @@ <p></p> </td> <td class="enum_member_description"> -<p>The master has any slave devices attached. This only makes sense if the device is a master.</p> +<p>The controller has any port devices attached. This only makes sense if the device is a controller.</p> <p></p> </td> <td class="auto-generated"> </td> diff --git a/docs/api/html/nm-openvswitch.html b/docs/api/html/nm-openvswitch.html index 42f15f5f..3f1b8460 100644 --- a/docs/api/html/nm-openvswitch.html +++ b/docs/api/html/nm-openvswitch.html @@ -47,12 +47,12 @@ <li class="listitem"><p>NetworkManager only ever talks to a single OVSDB instance via an UNIX domain socket.</p></li> <li class="listitem"><p>The configuration is made up of Bridges, Ports and - Interfaces. Interfaces are always enslaved to Ports, and Ports are always - enslaved to Bridges.</p></li> + Interfaces. Interfaces are always attached to Ports, and Ports are always + attached to Bridges.</p></li> <li class="listitem"><p>NetworkManager only creates Bridges, Ports and Interfaces you ask it to. Unlike <span class="command"><strong>ovs-vsctl</strong></span>, it doesn't create the local interface nor its port automatically.</p></li> -<li class="listitem"><p>You can't enslave Interface directly to a Bridge. You +<li class="listitem"><p>You can't attach Interface directly to a Bridge. You always need a Port, even if it has just one interface.</p></li> <li class="listitem"><p>There are no VLANs. The VLAN tagging is enabled by setting a ovs-port.tag @@ -69,7 +69,7 @@ type. Due to the limitations of OVSDB, "empty" Bridges (with no Ports) can't exist. NetworkManager inserts the records for Bridges into OVSDB when a Port is - enslaved. + attached. </p> </div> <hr> @@ -80,17 +80,17 @@ Due to the limitations of OVSDB, "empty" Ports (with no Interfaces) can't exist. Ports can also be configured to do VLAN tagging or Bonding. NetworkManager inserts the records for Ports into OVSDB when an Interface is - enslaved. Ports must be enslaved to a Bridge.</p> + attached. Ports must be attached to a Bridge.</p> </div> <hr> <div class="refsect2"> <a name="id-1.2.16.4.7"></a><h3>Interfaces</h3> -<p>Interfaces are represented by a connections enslaved to a Port. The +<p>Interfaces are represented by a connections attached to a Port. The system interfaces (that have a corresponding Linux link) have a respective connection.type of the link (e.g. "wired", "bond", "dummy", etc.). Other interfaces ("internal" or "patch" interfaces) are of ovs-interface type. The OVSDB entries are - inserted upon enslavement to a Port.</p> + inserted upon attachment to a Port.</p> </div> </div> <div class="refsect1"> @@ -100,10 +100,10 @@ <div class="example-contents"> <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-bridge conn.interface bridge0</code></strong> Connection 'ovs-bridge-bridge0' (d10fc64d-1d48-4394-a1b8-e1aea72f27d5) successfully added. -<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port0 master bridge0</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port0 controller bridge0</code></strong> Connection 'ovs-port-port0' (5ae22bae-bba4-4815-9ade-7e635633e1f0) successfully added. -<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-interface slave-type ovs-port conn.interface iface0 \ - master port0 ipv4.method manual ipv4.address 192.0.2.1/24</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-interface port-type ovs-port conn.interface iface0 \ + controller port0 ipv4.method manual ipv4.address 192.0.2.1/24</code></strong> Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) successfully added. </pre> <p>As said above, you need to create a Port even for a single interface. @@ -115,9 +115,9 @@ Connection 'ovs-interface-iface0' (3640d2a1-a2fd-4718-92f1-cffadb5b6cdc) success <br class="example-break"><div class="example"> <a name="id-1.2.16.5.3"></a><p class="title"><b>Example 21. Adding a Linux interface to a Bridge</b></p> <div class="example-contents"> -<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port1 master bridge0</code></strong> +<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port1 controller bridge0</code></strong> Connection 'ovs-port-port1' (67d041eb-8e7b-4458-afee-a1d07c9c4552) successfully added. -<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth0 master port1</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth0 controller port1</code></strong> Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully added. </pre> <p>Again, you need a port.</p> @@ -126,9 +126,9 @@ Connection 'ovs-slave-eth0' (d459c45c-cf78-4c1c-b4b7-505e71379624) successfully <br class="example-break"><div class="example"> <a name="id-1.2.16.5.4"></a><p class="title"><b>Example 22. Creating a VLAN</b></p> <div class="example-contents"> -<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port2 master bridge0 ovs-port.tag 120</code></strong> +<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface port2 controller bridge0 ovs-port.tag 120</code></strong> Connection 'ovs-port-port2' (3994c093-4ef7-4549-a4fd-627b831c3cb8) successfully added. -<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth1 master port2</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth1 controller port2</code></strong> Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully added. </pre> <p>It's just a port with a tag.</p> @@ -137,11 +137,11 @@ Connection 'ovs-slave-eth1' (099be06e-71ad-484d-8d5a-fcadc5f207f5) successfully <br class="example-break"><div class="example"> <a name="id-1.2.16.5.5"></a><p class="title"><b>Example 23. Creating a Bond</b></p> <div class="example-contents"> -<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface bond0 master bridge0</code></strong> +<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ovs-port conn.interface bond0 controller bridge0</code></strong> Connection 'ovs-port-bond0' (d154ebf9-e999-4e1b-a084-a3de53d25d8a) successfully added. -<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth2 master bond0</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth2 controller bond0</code></strong> Connection 'ovs-slave-eth2' (475ac1bf-30b2-4534-a877-27f33f58b082) successfully added. -<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth3 master bond0</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli conn add type ethernet conn.interface eth3 controller bond0</code></strong> Connection 'ovs-slave-eth3' (8dedeecb-ed12-482b-b77a-24a4fb835136) successfully added. </pre> <p>It's just a Port with multiple interfaces. See nm-settings-nmcli manual for diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html index 33867169..14a4fd9a 100644 --- a/docs/api/html/nm-settings-dbus.html +++ b/docs/api/html/nm-settings-dbus.html @@ -160,7 +160,7 @@ Depending on "connection.multi-connect", a profile can (auto)connect only once a <a name="nm-settings-dbus.property.connection.autoconnect-slaves"></a>autoconnect-slaves</td> <td align="left">NMSettingConnectionAutoconnectSlaves (int32)</td> <td align="left"> </td> -<td>Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0. +<td>Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0. Deprecated 1.46. Use "autoconnect-ports" instead, this is just an alias.</td> </tr> @@ -237,7 +237,7 @@ This feature requires a plugin which supports LLMNR. Otherwise, the setting has <a name="nm-settings-dbus.property.connection.master"></a>master</td> <td align="left">string</td> <td align="left"> </td> -<td>Interface name of the master device or UUID of the master connection. +<td>Interface name of the controller device or UUID of the controller connection. Deprecated 1.46. Use "controller" instead, this is just an alias.</td> </tr> @@ -339,7 +339,7 @@ This property is deprecated since version 1.44.This property is deprecated and h <a name="nm-settings-dbus.property.connection.slave-type"></a>slave-type</td> <td align="left">string</td> <td align="left"> </td> -<td>Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave. +<td>Setting name of the device type of this port's controller connection (eg, "bond"), or NULL if this connection is not a port. Deprecated 1.46. Use "port-type" instead, this is just an alias.</td> </tr> @@ -3841,7 +3841,7 @@ If the "tc" setting is not present, NetworkManager doesn't touch the filters pre <a name="nm-settings-dbus.property.vlan.flags"></a>flags</td> <td align="left">NMVlanFlags (uint32)</td> <td align="left"> </td> -<td>One or more flags which control the behavior and features of the VLAN interface. Flags include 0x1 (reorder-headers) (reordering of output packet headers), 0x2 (gvrp) (use of the GVRP protocol), and 0x4 (loose-binding) (loose binding of the interface to its master device's operating state). 0x8 (mvrp) (use of the MVRP protocol). +<td>One or more flags which control the behavior and features of the VLAN interface. Flags include 0x1 (reorder-headers) (reordering of output packet headers), 0x2 (gvrp) (use of the GVRP protocol), and 0x4 (loose-binding) (loose binding of the interface to its controller device's operating state). 0x8 (mvrp) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.</td> </tr> diff --git a/docs/api/html/nm-settings-ifcfg-rh.html b/docs/api/html/nm-settings-ifcfg-rh.html index ad13a12a..bfdf1af0 100644 --- a/docs/api/html/nm-settings-ifcfg-rh.html +++ b/docs/api/html/nm-settings-ifcfg-rh.html @@ -133,8 +133,8 @@ BOOTPROTO=dhcp </pre> <pre class="programlisting"><span class="bold"><strong>Bonding configuration:</strong></span> -ifcfg-BOND: ifcfg-BOND-slave: -NAME=BOND NAME=BOND-slave +ifcfg-BOND: ifcfg-BOND-port: +NAME=BOND NAME=BOND-port UUID=b41888aa-924c-450c-b0f8-85a4f0a51b4a UUID=9bb048e4-286a-4cc3-b104-007dbd20decb DEVICE=bond100 DEVICE=eth0 BONDING_OPTS="mode=balance-rr miimon=100" ONBOOT=yes @@ -154,16 +154,16 @@ NAME=team0-profile UUID=1d3460a0-7b37-457f-a300-fe8d92da4807 ONBOOT=yes -ifcfg-my_team0_slave1: -NAME=team0-slave1 +ifcfg-my_team0_port1: +NAME=team0-port1 UUID=d5aed298-c567-4cc1-b808-6d38ecef9e64 DEVICE=eth1 ONBOOT=yes TEAM_MASTER=team0 DEVICETYPE=TeamPort -ifcfg-my_team0_slave2: -NAME=team0-slave2 +ifcfg-my_team0_port2: +NAME=team0-port2 UUID=94e75f4e-e5ad-401c-8962-31e0ae5d2215 DEVICE=eth2 ONBOOT=yes @@ -1522,7 +1522,7 @@ Example: </strong></span>ZONE=Work</td> <td align="left">master</td> <td align="left">MASTER, MASTER_UUID, TEAM_MASTER, TEAM_MASTER_UUID, BRIDGE, BRIDGE_UUID</td> <td align="left"> </td> -<td align="left">Reference to master connection. The variable used depends on the connection type and the value. In general, if the *_UUID variant is present, the variant without *_UUID is ignored. NetworkManager attempts to write both for compatibility with legacy tooling.</td> +<td align="left">Reference to controller connection. The variable used depends on the connection type and the value. In general, if the *_UUID variant is present, the variant without *_UUID is ignored. NetworkManager attempts to write both for compatibility with legacy tooling.</td> </tr> <tr> <td align="left">slave-type</td> diff --git a/docs/api/html/nm-settings-keyfile.html b/docs/api/html/nm-settings-keyfile.html index da6f08e4..7b751164 100644 --- a/docs/api/html/nm-settings-keyfile.html +++ b/docs/api/html/nm-settings-keyfile.html @@ -159,8 +159,8 @@ id=MainBridge id=br-port-1 uuid=171ae855-a0ab-42b6-bd0c-60f5812eea9d uuid=d6e8ae98-71f8-4b3d-9d2d-2e26048fe794 interface-name=MainBridge interface-name=em1 type=bridge type=ethernet - master=MainBridge -[bridge] slave-type=bridge + controller=MainBridge +[bridge] port-type=bridge interface-name=MainBridge </pre> <pre class="programlisting"><span class="bold"><strong>A sample configuration for a VLAN:</strong></span> diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html index 435a4a69..e3551a8c 100644 --- a/docs/api/html/nm-settings-nmcli.html +++ b/docs/api/html/nm-settings-nmcli.html @@ -140,7 +140,7 @@ <tr> <td><p><span class="term"><code class="option"><a name="nm-settings-nmcli.property.connection.autoconnect-slaves"></a>connection.autoconnect-slaves</code></span></p></td> <td> -<p>Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.</p> +<p>Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.</p> <p>Deprecated 1.46. Use "autoconnect-ports" instead, this is just an alias.</p> <p> Format: choice (NMSettingConnectionAutoconnectSlaves)</p> @@ -239,7 +239,7 @@ <td> <p> Alias: master</p> -<p>Interface name of the master device or UUID of the master connection.</p> +<p>Interface name of the controller device or UUID of the controller connection.</p> <p>Deprecated 1.46. Use "controller" instead, this is just an alias.</p> <p> Format: string</p> @@ -340,7 +340,7 @@ <td> <p> Alias: slave-type</p> -<p>Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave.</p> +<p>Setting name of the device type of this port's controller connection (eg, "bond"), or NULL if this connection is not a port.</p> <p>Deprecated 1.46. Use "port-type" instead, this is just an alias.</p> <p> Format: string</p> @@ -5601,7 +5601,7 @@ Linux traffic control subsystem <td> <p> Alias: flags</p> -<p>One or more flags which control the behavior and features of the VLAN interface. Flags include "reorder-headers" (0x1) (reordering of output packet headers), "gvrp" (0x2) (use of the GVRP protocol), and "loose-binding" (0x4) (loose binding of the interface to its master device's operating state). "mvrp" (0x8) (use of the MVRP protocol).</p> +<p>One or more flags which control the behavior and features of the VLAN interface. Flags include "reorder-headers" (0x1) (reordering of output packet headers), "gvrp" (0x2) (use of the GVRP protocol), and "loose-binding" (0x4) (loose binding of the interface to its controller device's operating state). "mvrp" (0x8) (use of the MVRP protocol).</p> <p>The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.</p> <p> Format: flags (NMVlanFlags)</p> diff --git a/docs/api/html/nmcli-examples.html b/docs/api/html/nmcli-examples.html index 0eae3ac6..1b4f30ed 100644 --- a/docs/api/html/nmcli-examples.html +++ b/docs/api/html/nmcli-examples.html @@ -195,42 +195,42 @@ B,DISPATCH</pre> </div> </div> <br class="example-break"><div class="example"> -<a name="id-1.2.7.6.9"></a><p class="title"><b>Example 8. Adding a bonding master and two slave connection profiles</b></p> +<a name="id-1.2.7.6.9"></a><p class="title"><b>Example 8. Adding a bonding controller and two port connection profiles</b></p> <div class="example-contents"> <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type bond ifname mybond0 mode active-backup</code></strong> -<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet ifname eth1 master mybond0</code></strong> -<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet ifname eth2 master mybond0</code></strong></pre> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet ifname eth1 controller mybond0</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet ifname eth2 controller mybond0</code></strong></pre> <p> - This example demonstrates adding a bond master connection and two slaves. The - first command adds a master bond connection, naming the bonding interface + This example demonstrates adding a bond controller connection and two ports. The + first command adds a controller bond connection, naming the bonding interface <span class="emphasis"><em>mybond0</em></span> and using <span class="emphasis"><em>active-backup</em></span> mode. - The next two commands add slaves connections, both enslaved to <span class="emphasis"><em>mybond0</em></span>. - The first slave will be bound to <span class="emphasis"><em>eth1</em></span> interface, the second to + The next two commands add port connections, both attached as port to <span class="emphasis"><em>mybond0</em></span>. + The first port will be bound to <span class="emphasis"><em>eth1</em></span> interface, the second to <span class="emphasis"><em>eth2</em></span>. </p> </div> </div> <br class="example-break"><div class="example"> -<a name="id-1.2.7.6.10"></a><p class="title"><b>Example 9. Adding a team master and two slave connection profiles</b></p> +<a name="id-1.2.7.6.10"></a><p class="title"><b>Example 9. Adding a team controller and two port connection profiles</b></p> <div class="example-contents"> -<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type team con-name Team1 ifname Team1 config team1-master-json.conf</code></strong> -<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet con-name Team1-slave1 ifname em1 master Team1</code></strong> -<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet con-name Team1-slave2 ifname em2 master Team1</code></strong></pre> +<pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type team con-name Team1 ifname Team1 config team1-controller-json.conf</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet con-name Team1-port1 ifname em1 controller Team1</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet con-name Team1-port2 ifname em2 controller Team1</code></strong></pre> <p> - This example demonstrates adding a team master connection profile and two slaves. It is - very similar to the bonding example. The first command adds a master team profile, naming + This example demonstrates adding a team controller connection profile and two ports. It is + very similar to the bonding example. The first command adds a controller team profile, naming the team interface and the profile <span class="emphasis"><em>Team1</em></span>. The team configuration - for the master is read from <span class="emphasis"><em>team1-master-json.conf</em></span> file. Later, you can + for the controller is read from <span class="emphasis"><em>team1-controller-json.conf</em></span> file. Later, you can change the configuration with <span class="emphasis"><em>modify</em></span> command - (<span class="bold"><strong>nmcli con modify Team1 team.config team1-master-another-json.conf</strong></span>). - The last two commands add slaves profiles, both enslaved to <span class="emphasis"><em>Team1</em></span>. - The first slave will be bound to the <span class="emphasis"><em>em1</em></span> interface, the second to - <span class="emphasis"><em>em2</em></span>. The slaves don't specify <span class="emphasis"><em>config</em></span> and thus + (<span class="bold"><strong>nmcli con modify Team1 team.config team1-controller-another-json.conf</strong></span>). + The last two commands add port profiles, both attached as port to <span class="emphasis"><em>Team1</em></span>. + The first port will be bound to the <span class="emphasis"><em>em1</em></span> interface, the second to + <span class="emphasis"><em>em2</em></span>. The ports don't specify <span class="emphasis"><em>config</em></span> and thus <span class="emphasis"><em>teamd</em></span> will use its default configuration. You will activate the whole setup - by activating both slaves: + by activating both ports: </p> -<pre class="screen"> <code class="prompt">$ </code><strong class="userinput"><code>nmcli con up Team1-slave1</code></strong> - <code class="prompt">$ </code><strong class="userinput"><code>nmcli con up Team1-slave2</code></strong></pre> +<pre class="screen"> <code class="prompt">$ </code><strong class="userinput"><code>nmcli con up Team1-port1</code></strong> + <code class="prompt">$ </code><strong class="userinput"><code>nmcli con up Team1-port2</code></strong></pre> <p> By default, the created profiles are marked for auto-activation. But if another connection has been activated on the device, the new profile won't activate @@ -239,19 +239,19 @@ B,DISPATCH</pre> </div> </div> <br class="example-break"><div class="example"> -<a name="id-1.2.7.6.11"></a><p class="title"><b>Example 10. Adding a bridge and two slave profiles</b></p> +<a name="id-1.2.7.6.11"></a><p class="title"><b>Example 10. Adding a bridge and two port profiles</b></p> <div class="example-contents"> <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type bridge con-name TowerBridge ifname TowerBridge</code></strong> -<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet con-name br-slave-1 ifname ens3 master TowerBridge</code></strong> -<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet con-name br-slave-2 ifname ens4 master TowerBridge</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet con-name br-port-1 ifname ens3 controller TowerBridge</code></strong> +<code class="prompt">$ </code><strong class="userinput"><code>nmcli con add type ethernet con-name br-port-2 ifname ens4 controller TowerBridge</code></strong> <code class="prompt">$ </code><strong class="userinput"><code>nmcli con modify TowerBridge bridge.stp no</code></strong></pre> <p> - This example demonstrates adding a bridge master connection and two slaves. The - first command adds a master bridge connection, naming the bridge interface and + This example demonstrates adding a bridge controller connection and two ports. The + first command adds a controller bridge connection, naming the bridge interface and the profile as <span class="emphasis"><em>TowerBridge</em></span>. - The next two commands add slaves profiles, both will be enslaved to + The next two commands add ports profiles, both will be attached as port to <span class="emphasis"><em>TowerBridge</em></span>. - The first slave will be tied to <span class="emphasis"><em>ens3</em></span> interface, the second to + The first port will be tied to <span class="emphasis"><em>ens3</em></span> interface, the second to <span class="emphasis"><em>ens4</em></span>. The last command will disable 802.1D STP for the TowerBridge profile. </p> @@ -401,8 +401,8 @@ connection.timestamp: 0 connection.read-only: no connection.permissions: connection.zone: -- -connection.master: -- -connection.slave-type: -- +connection.controller: -- +connection.port-type: -- connection.secondaries: connection.gateway-ping-timeout: 0 --------------------------------------------------------------------------- @@ -491,8 +491,8 @@ connection.timestamp: 0 connection.read-only: no connection.permissions: connection.zone: -- -connection.master: -- -connection.slave-type: -- +connection.controller: -- +connection.port-type: -- connection.secondaries: connection.gateway-ping-timeout: 0 --------------------------------------------------------------------------- @@ -551,8 +551,8 @@ connection.timestamp: 0 connection.read-only: no connection.permissions: connection.zone: -- -connection.master: -- -connection.slave-type: -- +connection.controller: -- +connection.port-type: -- connection.secondaries: connection.gateway-ping-timeout: 0 --------------------------------------------------------------------------- diff --git a/docs/api/html/nmcli.html b/docs/api/html/nmcli.html index 94dbcece..0139ed6d 100644 --- a/docs/api/html/nmcli.html +++ b/docs/api/html/nmcli.html @@ -738,9 +738,9 @@ <li class="listitem"><p><code class="literal">adsl</code></p></li> <li class="listitem"><p><code class="literal">bluetooth</code></p></li> <li class="listitem"><p><code class="literal">bond</code></p></li> -<li class="listitem"><p><code class="literal">bond-slave</code> (deprecated for ethernet with master)</p></li> +<li class="listitem"><p><code class="literal">bond-slave</code> (deprecated for ethernet with controller)</p></li> <li class="listitem"><p><code class="literal">bridge</code></p></li> -<li class="listitem"><p><code class="literal">bridge-slave</code> (deprecated for ethernet with master)</p></li> +<li class="listitem"><p><code class="literal">bridge-slave</code> (deprecated for ethernet with controller)</p></li> <li class="listitem"><p><code class="literal">cdma</code></p></li> <li class="listitem"><p><code class="literal">dummy</code></p></li> <li class="listitem"><p><code class="literal">generic</code></p></li> @@ -757,7 +757,7 @@ <li class="listitem"><p><code class="literal">ovs-port</code></p></li> <li class="listitem"><p><code class="literal">pppoe</code></p></li> <li class="listitem"><p><code class="literal">team</code></p></li> -<li class="listitem"><p><code class="literal">team-slave</code> (deprecated for ethernet with master)</p></li> +<li class="listitem"><p><code class="literal">team-slave</code> (deprecated for ethernet with controller)</p></li> <li class="listitem"><p><code class="literal">tun</code></p></li> <li class="listitem"><p><code class="literal">veth</code></p></li> <li class="listitem"><p><code class="literal">vlan</code></p></li> diff --git a/docs/api/html/settings-connection.html b/docs/api/html/settings-connection.html index 50df7813..7ca59cc0 100644 --- a/docs/api/html/settings-connection.html +++ b/docs/api/html/settings-connection.html @@ -97,7 +97,7 @@ Depending on "connection.multi-connect", a profile can (auto)connect only once a <td><pre class="screen">autoconnect-slaves</pre></td> <td><pre class="screen">NMSettingConnectionAutoconnectSlaves (int32)</pre></td> <td><pre class="screen"></pre></td> -<td>Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0. +<td>Whether or not ports of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for controller connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave port connections untouched, 1: activate all the port connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0. Deprecated 1.46. Use "autoconnect-ports" instead, this is just an alias.</td> </tr> @@ -165,7 +165,7 @@ This feature requires a plugin which supports LLMNR. Otherwise, the setting has <td><pre class="screen">master</pre></td> <td><pre class="screen">string</pre></td> <td><pre class="screen"></pre></td> -<td>Interface name of the master device or UUID of the master connection. +<td>Interface name of the controller device or UUID of the controller connection. Deprecated 1.46. Use "controller" instead, this is just an alias.</td> </tr> @@ -255,7 +255,7 @@ At this time only the "user" [type] is allowed. Any other values are ignored an <td><pre class="screen">slave-type</pre></td> <td><pre class="screen">string</pre></td> <td><pre class="screen"></pre></td> -<td>Setting name of the device type of this slave's master connection (eg, "bond"), or NULL if this connection is not a slave. +<td>Setting name of the device type of this port's controller connection (eg, "bond"), or NULL if this connection is not a port. Deprecated 1.46. Use "port-type" instead, this is just an alias.</td> </tr> diff --git a/docs/api/html/settings-vlan.html b/docs/api/html/settings-vlan.html index 9371e4eb..28e3da69 100644 --- a/docs/api/html/settings-vlan.html +++ b/docs/api/html/settings-vlan.html @@ -63,7 +63,7 @@ <td><pre class="screen">flags</pre></td> <td><pre class="screen">NMVlanFlags (uint32)</pre></td> <td><pre class="screen"></pre></td> -<td>One or more flags which control the behavior and features of the VLAN interface. Flags include 0x1 (reorder-headers) (reordering of output packet headers), 0x2 (gvrp) (use of the GVRP protocol), and 0x4 (loose-binding) (loose binding of the interface to its master device's operating state). 0x8 (mvrp) (use of the MVRP protocol). +<td>One or more flags which control the behavior and features of the VLAN interface. Flags include 0x1 (reorder-headers) (reordering of output packet headers), 0x2 (gvrp) (use of the GVRP protocol), and 0x4 (loose-binding) (loose binding of the interface to its controller device's operating state). 0x8 (mvrp) (use of the MVRP protocol). The default value of this property is NM_VLAN_FLAG_REORDER_HEADERS, but it used to be 0. To preserve backward compatibility, the default-value in the D-Bus API continues to be 0 and a missing property on D-Bus is still considered as 0.</td> </tr> 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> diff --git a/docs/libnm/html/NMDevice.html b/docs/libnm/html/NMDevice.html index c7cbf68c..7d8b88a5 100644 --- a/docs/libnm/html/NMDevice.html +++ b/docs/libnm/html/NMDevice.html @@ -1283,7 +1283,7 @@ nm_device_get_ports (<em class="parameter"><code><a class="link" href="NMDevice. <div class="refsect3"> <a name="nm-device-get-ports.returns"></a><h4>Returns</h4> <p>the <span class="type">GPtrArray</span> containing <span class="type">NMDevices</span> that -are slaves of <em class="parameter"><code>device</code></em> +are ports of <em class="parameter"><code>device</code></em> . This is the internal copy used by the device and must not be modified. </p> <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p> diff --git a/docs/libnm/html/NMDeviceBond.html b/docs/libnm/html/NMDeviceBond.html index 50f4fbfa..3b6e1faa 100644 --- a/docs/libnm/html/NMDeviceBond.html +++ b/docs/libnm/html/NMDeviceBond.html @@ -195,7 +195,7 @@ nm_device_bond_get_slaves (<em class="parameter"><code><a class="link" href="NMD <p><code class="literal">nm_device_bond_get_slaves</code> has been deprecated since version 1.34 and should not be used in newly-written code.</p> <p>Use <a class="link" href="NMDevice.html#nm-device-get-ports" title="nm_device_get_ports ()"><code class="function">nm_device_get_ports()</code></a> instead.</p> </div> -<p>Gets the devices currently enslaved to <em class="parameter"><code>device</code></em> +<p>Gets the devices currently attached as port to <em class="parameter"><code>device</code></em> .</p> <div class="refsect3"> <a name="nm-device-bond-get-slaves.parameters"></a><h4>Parameters</h4> @@ -261,7 +261,7 @@ copy used by the device, and must not be modified. </p> <div class="refsect2"> <a name="NMDeviceBond--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3> <pre class="programlisting"> “slaves” <span class="type">GPtrArray</span> *</pre> -<p>The devices enslaved to the bond device.</p> +<p>The devices attached as port to the bond device.</p> <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p> <p>Owner: NMDeviceBond</p> <p>Flags: Read</p> diff --git a/docs/libnm/html/NMDeviceBridge.html b/docs/libnm/html/NMDeviceBridge.html index 83ea42bc..f0be9f43 100644 --- a/docs/libnm/html/NMDeviceBridge.html +++ b/docs/libnm/html/NMDeviceBridge.html @@ -195,7 +195,7 @@ nm_device_bridge_get_slaves (<em class="parameter"><code><a class="link" href="N <p><code class="literal">nm_device_bridge_get_slaves</code> has been deprecated since version 1.34 and should not be used in newly-written code.</p> <p>Use <a class="link" href="NMDevice.html#nm-device-get-ports" title="nm_device_get_ports ()"><code class="function">nm_device_get_ports()</code></a> instead.</p> </div> -<p>Gets the devices currently enslaved to <em class="parameter"><code>device</code></em> +<p>Gets the devices currently attached as port to <em class="parameter"><code>device</code></em> .</p> <div class="refsect3"> <a name="nm-device-bridge-get-slaves.parameters"></a><h4>Parameters</h4> @@ -215,7 +215,7 @@ nm_device_bridge_get_slaves (<em class="parameter"><code><a class="link" href="N <div class="refsect3"> <a name="nm-device-bridge-get-slaves.returns"></a><h4>Returns</h4> <p>the <span class="type">GPtrArray</span> containing -<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em> +<span class="type">NMDevices</span> that are ports of <em class="parameter"><code>device</code></em> . This is the internal copy used by the device, and must not be modified. </p> <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p> @@ -261,7 +261,7 @@ copy used by the device, and must not be modified. </p> <div class="refsect2"> <a name="NMDeviceBridge--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3> <pre class="programlisting"> “slaves” <span class="type">GPtrArray</span> *</pre> -<p>The devices enslaved to the bridge device.</p> +<p>The devices attached as port to the bridge device.</p> <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p> <p>Owner: NMDeviceBridge</p> <p>Flags: Read</p> diff --git a/docs/libnm/html/NMDeviceOvsBridge.html b/docs/libnm/html/NMDeviceOvsBridge.html index cf296576..80f54539 100644 --- a/docs/libnm/html/NMDeviceOvsBridge.html +++ b/docs/libnm/html/NMDeviceOvsBridge.html @@ -105,7 +105,7 @@ nm_device_ovs_bridge_get_slaves (<em class="parameter"><code><a class="link" hre <p><code class="literal">nm_device_ovs_bridge_get_slaves</code> has been deprecated since version 1.34 and should not be used in newly-written code.</p> <p>Use <a class="link" href="NMDevice.html#nm-device-get-ports" title="nm_device_get_ports ()"><code class="function">nm_device_get_ports()</code></a> instead.</p> </div> -<p>Gets the ports currently enslaved to <em class="parameter"><code>device</code></em> +<p>Gets the ports currently attached as port to <em class="parameter"><code>device</code></em> .</p> <div class="refsect3"> <a name="nm-device-ovs-bridge-get-slaves.parameters"></a><h4>Parameters</h4> @@ -125,7 +125,7 @@ nm_device_ovs_bridge_get_slaves (<em class="parameter"><code><a class="link" hre <div class="refsect3"> <a name="nm-device-ovs-bridge-get-slaves.returns"></a><h4>Returns</h4> <p>the <span class="type">GPtrArray</span> containing -<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em> +<span class="type">NMDevices</span> that are ports of <em class="parameter"><code>device</code></em> . This is the internal copy used by the device, and must not be modified. </p> <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p> @@ -152,7 +152,7 @@ copy used by the device, and must not be modified. </p> <div class="refsect2"> <a name="NMDeviceOvsBridge--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3> <pre class="programlisting"> “slaves” <span class="type">GPtrArray</span> *</pre> -<p>Gets the ports currently enslaved to the device.</p> +<p>Gets the ports currently attached as port to the device.</p> <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p> <p>Owner: NMDeviceOvsBridge</p> <p>Flags: Read</p> diff --git a/docs/libnm/html/NMDeviceOvsPort.html b/docs/libnm/html/NMDeviceOvsPort.html index dcd25db2..e664afb7 100644 --- a/docs/libnm/html/NMDeviceOvsPort.html +++ b/docs/libnm/html/NMDeviceOvsPort.html @@ -105,7 +105,7 @@ nm_device_ovs_port_get_slaves (<em class="parameter"><code><a class="link" href= <p><code class="literal">nm_device_ovs_port_get_slaves</code> has been deprecated since version 1.34 and should not be used in newly-written code.</p> <p>Use <a class="link" href="NMDevice.html#nm-device-get-ports" title="nm_device_get_ports ()"><code class="function">nm_device_get_ports()</code></a> instead.</p> </div> -<p>Gets the interfaces currently enslaved to <em class="parameter"><code>device</code></em> +<p>Gets the interfaces currently attached as port to <em class="parameter"><code>device</code></em> .</p> <div class="refsect3"> <a name="nm-device-ovs-port-get-slaves.parameters"></a><h4>Parameters</h4> @@ -125,7 +125,7 @@ nm_device_ovs_port_get_slaves (<em class="parameter"><code><a class="link" href= <div class="refsect3"> <a name="nm-device-ovs-port-get-slaves.returns"></a><h4>Returns</h4> <p>the <span class="type">GPtrArray</span> containing -<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em> +<span class="type">NMDevices</span> that are ports of <em class="parameter"><code>device</code></em> . This is the internal copy used by the device, and must not be modified. </p> <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p> @@ -152,7 +152,7 @@ copy used by the device, and must not be modified. </p> <div class="refsect2"> <a name="NMDeviceOvsPort--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3> <pre class="programlisting"> “slaves” <span class="type">GPtrArray</span> *</pre> -<p>Gets the interfaces currently enslaved to the device.</p> +<p>Gets the interfaces currently attached as port to the device.</p> <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p> <p>Owner: NMDeviceOvsPort</p> <p>Flags: Read</p> diff --git a/docs/libnm/html/NMDeviceTeam.html b/docs/libnm/html/NMDeviceTeam.html index 84bae898..593166dc 100644 --- a/docs/libnm/html/NMDeviceTeam.html +++ b/docs/libnm/html/NMDeviceTeam.html @@ -212,7 +212,7 @@ nm_device_team_get_slaves (<em class="parameter"><code><a class="link" href="NMD <p><code class="literal">nm_device_team_get_slaves</code> has been deprecated since version 1.34 and should not be used in newly-written code.</p> <p>Use <a class="link" href="NMDevice.html#nm-device-get-ports" title="nm_device_get_ports ()"><code class="function">nm_device_get_ports()</code></a> instead.</p> </div> -<p>Gets the devices currently enslaved to <em class="parameter"><code>device</code></em> +<p>Gets the devices currently attach as port to <em class="parameter"><code>device</code></em> .</p> <div class="refsect3"> <a name="nm-device-team-get-slaves.parameters"></a><h4>Parameters</h4> @@ -232,7 +232,7 @@ nm_device_team_get_slaves (<em class="parameter"><code><a class="link" href="NMD <div class="refsect3"> <a name="nm-device-team-get-slaves.returns"></a><h4>Returns</h4> <p>the <span class="type">GPtrArray</span> containing -<span class="type">NMDevices</span> that are slaves of <em class="parameter"><code>device</code></em> +<span class="type">NMDevices</span> that are ports of <em class="parameter"><code>device</code></em> . This is the internal copy used by the device, and must not be modified. </p> <p><span class="annotation">[<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> NMDevice]</span></p> @@ -322,7 +322,7 @@ device, and must not be modified.</p> <div class="refsect2"> <a name="NMDeviceTeam--slaves"></a><h3>The <code class="literal">“slaves”</code> property</h3> <pre class="programlisting"> “slaves” <span class="type">GPtrArray</span> *</pre> -<p>The devices enslaved to the team device.</p> +<p>The devices attached as port to the team device.</p> <p><span class="annotation">[<acronym title="Override the parsed C type with given type."><span class="acronym">type</span></acronym> GPtrArray(NMDevice)]</span></p> <p>Owner: NMDeviceTeam</p> <p>Flags: Read</p> diff --git a/docs/libnm/html/NMSettingConnection.html b/docs/libnm/html/NMSettingConnection.html index 2620fe0f..8d79934b 100644 --- a/docs/libnm/html/NMSettingConnection.html +++ b/docs/libnm/html/NMSettingConnection.html @@ -1197,7 +1197,7 @@ is just an alias.</p> </div> <div class="refsect3"> <a name="nm-setting-connection-get-master.returns"></a><h4>Returns</h4> -<p> interface name of the master device or UUID of the master +<p> interface name of the controller device or UUID of the controller connection.</p> </div> </div> @@ -1254,7 +1254,7 @@ nm_setting_connection_is_slave_type (<em class="parameter"><code><a class="link" <td class="parameter_name"><p>type</p></td> <td class="parameter_description"><p>the setting name (ie <a class="link" href="NMSettingBond.html#NM-SETTING-BOND-SETTING-NAME:CAPS" title="NM_SETTING_BOND_SETTING_NAME"><span class="type">NM_SETTING_BOND_SETTING_NAME</span></a>) to be matched against <em class="parameter"><code>setting</code></em> -'s slave type</p></td> +'s port type</p></td> <td class="parameter_annotations"> </td> </tr> </tbody> @@ -1262,7 +1262,7 @@ against <em class="parameter"><code>setting</code></em> </div> <div class="refsect3"> <a name="nm-setting-connection-is-slave-type.returns"></a><h4>Returns</h4> -<p> <code class="literal">TRUE</code> if connection is of the given slave <em class="parameter"><code>type</code></em> +<p> <code class="literal">TRUE</code> if connection is of the given port <em class="parameter"><code>type</code></em> </p> </div> </div> @@ -1294,7 +1294,7 @@ is just an alias.</p> </div> <div class="refsect3"> <a name="nm-setting-connection-get-slave-type.returns"></a><h4>Returns</h4> -<p> the type of slave this connection is, if any</p> +<p> the type of port this connection is, if any</p> </div> </div> <hr> @@ -1353,7 +1353,7 @@ is just an alias.</p> </div> <div class="refsect3"> <a name="nm-setting-connection-get-autoconnect-slaves.returns"></a><h4>Returns</h4> -<p> whether slaves of the connection should be activated together +<p> whether ports of the connection should be activated together with the connection.</p> </div> <p class="since">Since: 1.2</p> @@ -2101,7 +2101,7 @@ property.</p> <a name="NMSettingConnectionAutoconnectSlaves"></a><h3>enum NMSettingConnectionAutoconnectSlaves</h3> <div class="warning"><p><code class="literal">NMSettingConnectionAutoconnectSlaves</code> has been deprecated since version 1.46 and should not be used in newly-written code.</p></div> <p><a class="link" href="NMSettingConnection.html#NMSettingConnectionAutoconnectSlaves" title="enum NMSettingConnectionAutoconnectSlaves"><span class="type">NMSettingConnectionAutoconnectSlaves</span></a> values indicate whether slave connections -should be activated when master is activated.</p> +should be activated when controller is activated.</p> <div class="refsect3"> <a name="NMSettingConnectionAutoconnectSlaves.members"></a><h4>Members</h4> <div class="informaltable"><table class="informaltable" width="100%" border="0"> @@ -2122,7 +2122,7 @@ should be activated when master is activated.</p> <td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-NO:CAPS"></a>NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_NO</p></td> <td class="enum_member_description"> <p>slaves are not brought up when -master is activated</p> +controller is activated</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -2130,7 +2130,7 @@ master is activated</p> <td class="enum_member_name"><p><a name="NM-SETTING-CONNECTION-AUTOCONNECT-SLAVES-YES:CAPS"></a>NM_SETTING_CONNECTION_AUTOCONNECT_SLAVES_YES</p></td> <td class="enum_member_description"> <p>slaves are brought up when -master is activated</p> +controller is activated</p> </td> <td class="enum_member_annotations"> </td> </tr> diff --git a/docs/libnm/html/NMSettingTeam.html b/docs/libnm/html/NMSettingTeam.html index eaa62d32..82d73897 100644 --- a/docs/libnm/html/NMSettingTeam.html +++ b/docs/libnm/html/NMSettingTeam.html @@ -1011,7 +1011,7 @@ going down and the runner being notified about it.</p> <a name="nm-team-link-watcher-get-init-wait"></a><h3>nm_team_link_watcher_get_init_wait ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> nm_team_link_watcher_get_init_wait (<em class="parameter"><code>const <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> *watcher</code></em>);</pre> -<p>Gets the init_wait interval (in milliseconds) that the team slave should +<p>Gets the init_wait interval (in milliseconds) that the team port should wait before sending the first packet to the target host.</p> <div class="refsect3"> <a name="nm-team-link-watcher-get-init-wait.parameters"></a><h4>Parameters</h4> @@ -1035,7 +1035,7 @@ wait before sending the first packet to the target host.</p> <a name="nm-team-link-watcher-get-interval"></a><h3>nm_team_link_watcher_get_interval ()</h3> <pre class="programlisting"><span class="returnvalue">int</span> nm_team_link_watcher_get_interval (<em class="parameter"><code>const <a class="link" href="NMSettingTeam.html#NMTeamLinkWatcher"><span class="type">NMTeamLinkWatcher</span></a> *watcher</code></em>);</pre> -<p>Gets the interval (in milliseconds) that the team slave should wait between +<p>Gets the interval (in milliseconds) that the team port should wait between sending two check packets to the target host.</p> <div class="refsect3"> <a name="nm-team-link-watcher-get-interval.parameters"></a><h4>Parameters</h4> diff --git a/docs/libnm/html/api-index-full.html b/docs/libnm/html/api-index-full.html index dd29e8a6..39fa0e7b 100644 --- a/docs/libnm/html/api-index-full.html +++ b/docs/libnm/html/api-index-full.html @@ -225,6 +225,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS" title="NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES">NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES</a>, macro in <a class="link" href="libnm-nm-dbus-interface.html" title="nm-dbus-interface">nm-dbus-interface</a> +</dt> +<dd></dd> +<dt> <a class="link" href="NMActiveConnection.html#NMActiveConnection-struct" title="NMActiveConnection">NMActiveConnection</a>, struct in <a class="link" href="NMActiveConnection.html" title="NMActiveConnection">NMActiveConnection</a> </dt> <dd></dd> diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index ad68de63..db1ea997 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">libnm Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for libnm 1.48.6 + for libnm 1.48.8 The latest version of this documentation can be found on-line at <a class="ulink" href="https://networkmanager.dev/docs/libnm/latest/" target="_top">https://networkmanager.dev/docs/libnm/latest/</a>. diff --git a/docs/libnm/html/libnm-nm-dbus-interface.html b/docs/libnm/html/libnm-nm-dbus-interface.html index 0e1ca808..0a3867ad 100644 --- a/docs/libnm/html/libnm-nm-dbus-interface.html +++ b/docs/libnm/html/libnm-nm-dbus-interface.html @@ -493,6 +493,10 @@ <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMActivationStateFlags" title="enum NMActivationStateFlags">NMActivationStateFlags</a></td> </tr> <tr> +<td class="define_keyword">#define</td> +<td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS" title="NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES">NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES</a></td> +</tr> +<tr> <td class="datatype_keyword">enum</td> <td class="function_name"><a class="link" href="libnm-nm-dbus-interface.html#NMSettingsAddConnection2Flags" title="enum NMSettingsAddConnection2Flags">NMSettingsAddConnection2Flags</a></td> </tr> @@ -1270,7 +1274,7 @@ GSM/UMTS, or LTE network access protocols</p> <tr> <td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-BOND:CAPS"></a>NM_DEVICE_TYPE_BOND</p></td> <td class="enum_member_description"> -<p>a bond master interface</p> +<p>a bond controller interface</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1291,7 +1295,7 @@ GSM/UMTS, or LTE network access protocols</p> <tr> <td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-BRIDGE:CAPS"></a>NM_DEVICE_TYPE_BRIDGE</p></td> <td class="enum_member_description"> -<p>a bridge master interface</p> +<p>a bridge controller interface</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -1305,7 +1309,7 @@ GSM/UMTS, or LTE network access protocols</p> <tr> <td class="enum_member_name"><p><a name="NM-DEVICE-TYPE-TEAM:CAPS"></a>NM_DEVICE_TYPE_TEAM</p></td> <td class="enum_member_description"> -<p>a team master interface</p> +<p>a team controller interface</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -3622,16 +3626,16 @@ an external configuration of a networking device. Since: 1.26.</p> <td class="enum_member_annotations"> </td> </tr> <tr> -<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-IS-MASTER:CAPS"></a>NM_ACTIVATION_STATE_FLAG_IS_MASTER</p></td> +<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-IS-CONTROLLER:CAPS"></a>NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER</p></td> <td class="enum_member_description"> -<p>the device is a master.</p> +<p>the device is a controller.</p> </td> <td class="enum_member_annotations"> </td> </tr> <tr> -<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-IS-SLAVE:CAPS"></a>NM_ACTIVATION_STATE_FLAG_IS_SLAVE</p></td> +<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-IS-PORT:CAPS"></a>NM_ACTIVATION_STATE_FLAG_IS_PORT</p></td> <td class="enum_member_description"> -<p>the device is a slave.</p> +<p>the device is a port.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -3657,10 +3661,10 @@ an external configuration of a networking device. Since: 1.26.</p> <td class="enum_member_annotations"> </td> </tr> <tr> -<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS"></a>NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES</p></td> +<td class="enum_member_name"><p><a name="NM-ACTIVATION-STATE-FLAG-CONTROLLER-HAS-PORTS:CAPS"></a>NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS</p></td> <td class="enum_member_description"> -<p>The master has any slave devices attached. -This only makes sense if the device is a master.</p> +<p>The controller has any port devices attached. +This only makes sense if the device is a controller.</p> </td> <td class="enum_member_annotations"> </td> </tr> @@ -3689,6 +3693,12 @@ represent an external configuration of a networking device. Since: 1.26.</p> </div> <hr> <div class="refsect2"> +<a name="NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS"></a><h3>NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES</h3> +<pre class="programlisting">#define NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES NM_ACTIVATION_FLAG_CONTROLLER_HAS_PORTS +</pre> +</div> +<hr> +<div class="refsect2"> <a name="NMSettingsAddConnection2Flags"></a><h3>enum NMSettingsAddConnection2Flags</h3> <p>Numeric flags for the "flags" argument of <code class="function">AddConnection2()</code> D-Bus API.</p> <div class="refsect3"> 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 diff --git a/docs/libnm/html/libnm-nm-version-macros.html b/docs/libnm/html/libnm-nm-version-macros.html index aa3f6e90..4ea9a41e 100644 --- a/docs/libnm/html/libnm-nm-version-macros.html +++ b/docs/libnm/html/libnm-nm-version-macros.html @@ -269,7 +269,7 @@ is compiled against.</p> <hr> <div class="refsect2"> <a name="NM-MICRO-VERSION:CAPS"></a><h3>NM_MICRO_VERSION</h3> -<pre class="programlisting">#define NM_MICRO_VERSION (6) +<pre class="programlisting">#define NM_MICRO_VERSION (8) </pre> <p>Evaluates to the micro version number of NetworkManager which this source compiled against.</p> diff --git a/docs/libnm/html/libnm.devhelp2 b/docs/libnm/html/libnm.devhelp2 index 71a1a7e9..070c0df1 100644 --- a/docs/libnm/html/libnm.devhelp2 +++ b/docs/libnm/html/libnm.devhelp2 @@ -510,6 +510,7 @@ <keyword type="enum" name="enum NMRollbackResult" link="libnm-nm-dbus-interface.html#NMRollbackResult" since="1.4"/> <keyword type="enum" name="enum NMSettingsConnectionFlags" link="libnm-nm-dbus-interface.html#NMSettingsConnectionFlags" since="1.12"/> <keyword type="enum" name="enum NMActivationStateFlags" link="libnm-nm-dbus-interface.html#NMActivationStateFlags" since="1.10"/> + <keyword type="macro" name="NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS"/> <keyword type="enum" name="enum NMSettingsAddConnection2Flags" link="libnm-nm-dbus-interface.html#NMSettingsAddConnection2Flags" since="1.20"/> <keyword type="enum" name="enum NMSettingsUpdate2Flags" link="libnm-nm-dbus-interface.html#NMSettingsUpdate2Flags" since="1.12"/> <keyword type="enum" name="enum NMDeviceReapplyFlags" link="libnm-nm-dbus-interface.html#NMDeviceReapplyFlags" since="1.42"/> @@ -3867,12 +3868,12 @@ <keyword type="constant" name="NM_SETTINGS_CONNECTION_FLAG_VOLATILE" link="libnm-nm-dbus-interface.html#NM-SETTINGS-CONNECTION-FLAG-VOLATILE:CAPS"/> <keyword type="constant" name="NM_SETTINGS_CONNECTION_FLAG_EXTERNAL" link="libnm-nm-dbus-interface.html#NM-SETTINGS-CONNECTION-FLAG-EXTERNAL:CAPS"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_NONE" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-NONE:CAPS"/> - <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_MASTER" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IS-MASTER:CAPS"/> - <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_SLAVE" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IS-SLAVE:CAPS"/> + <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_CONTROLLER" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IS-CONTROLLER:CAPS"/> + <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IS_PORT" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IS-PORT:CAPS"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_LAYER2_READY" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-LAYER2-READY:CAPS"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IP4_READY" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IP4-READY:CAPS"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_IP6_READY" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-IP6-READY:CAPS"/> - <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_MASTER_HAS_SLAVES" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-MASTER-HAS-SLAVES:CAPS"/> + <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_CONTROLLER_HAS_PORTS" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-CONTROLLER-HAS-PORTS:CAPS"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_LIFETIME_BOUND_TO_PROFILE_VISIBILITY" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-LIFETIME-BOUND-TO-PROFILE-VISIBILITY:CAPS"/> <keyword type="constant" name="NM_ACTIVATION_STATE_FLAG_EXTERNAL" link="libnm-nm-dbus-interface.html#NM-ACTIVATION-STATE-FLAG-EXTERNAL:CAPS"/> <keyword type="constant" name="NM_SETTINGS_ADD_CONNECTION2_FLAG_NONE" link="libnm-nm-dbus-interface.html#NM-SETTINGS-ADD-CONNECTION2-FLAG-NONE:CAPS"/> diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html index 2f493595..47743c6e 100644 --- a/docs/libnm/html/usage.html +++ b/docs/libnm/html/usage.html @@ -96,7 +96,7 @@ </p> <pre class="screen"><code class="prompt">$ </code><strong class="userinput"><code>cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c</code></strong> <code class="prompt">$ </code><strong class="userinput"><code>./hello-nm</code></strong> - NetworkManager version: 1.48.6 + NetworkManager version: 1.48.8 <code class="prompt">$ </code></pre> <p> |