From 56928734cbcf1d3a02fae4f152a541df1b04e04a Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 2 Oct 2024 22:17:51 +0200 Subject: New upstream version 1.50.0 --- configure.ac | 4 +- docs/api/html/NetworkManager.devhelp2 | 2 +- docs/api/html/ch01.html | 6 +- ...-org.freedesktop.NetworkManager.Device.Hsr.html | 20 +- docs/api/html/index.html | 8 +- docs/api/html/ix01.html | 462 ++++++++++----------- docs/api/html/nm-settings-dbus.html | 170 ++++---- docs/api/html/nm-settings-nmcli.html | 186 ++++----- docs/api/html/ref-settings.html | 6 +- docs/api/html/settings-802-11-olpc-mesh.html | 4 +- .../html/settings-802-11-wireless-security.html | 4 +- docs/api/html/settings-802-11-wireless.html | 4 +- docs/api/html/settings-802-3-ethernet.html | 4 +- docs/api/html/settings-bond-port.html | 4 +- docs/api/html/settings-gsm.html | 4 +- docs/api/html/settings-hostname.html | 8 +- docs/api/html/settings-hsr.html | 12 +- docs/api/html/settings-infiniband.html | 8 +- docs/api/html/settings-ip-tunnel.html | 4 +- docs/api/html/settings-ipv4.html | 4 +- docs/api/html/settings-ipv6.html | 4 +- docs/api/html/settings-link.html | 4 +- docs/api/html/settings-macsec.html | 4 +- docs/api/html/settings-macvlan.html | 4 +- docs/api/html/settings-match.html | 4 +- docs/api/html/settings-ovs-bridge.html | 4 +- docs/api/html/settings-ovs-dpdk.html | 4 +- docs/api/html/settings-ovs-interface.html | 4 +- docs/api/html/settings-ovs-patch.html | 4 +- docs/api/html/settings-ovs-port.html | 4 +- docs/api/html/settings-ppp.html | 4 +- docs/api/html/settings-pppoe.html | 4 +- docs/api/html/settings-proxy.html | 4 +- docs/api/html/settings-serial.html | 4 +- docs/api/html/settings-sriov.html | 4 +- docs/api/html/settings-tc.html | 4 +- docs/api/html/settings-team-port.html | 4 +- docs/api/html/settings-team.html | 4 +- docs/api/html/settings-tun.html | 4 +- docs/api/html/settings-user.html | 4 +- docs/api/html/settings-vlan.html | 4 +- docs/api/html/settings-vpn.html | 4 +- docs/api/html/settings-vrf.html | 4 +- docs/api/html/settings-vxlan.html | 4 +- docs/api/html/settings-wifi-p2p.html | 4 +- docs/api/html/settings-wimax.html | 4 +- docs/api/html/settings-wireguard.html | 4 +- docs/api/html/settings-wpan.html | 4 +- docs/libnm/html/index.html | 2 +- docs/libnm/html/libnm-nm-version-macros.html | 4 +- docs/libnm/html/usage.html | 2 +- .../org.freedesktop.NetworkManager.Device.Hsr.xml | 10 +- man/NetworkManager-dispatcher.8 | 4 +- man/NetworkManager-wait-online.service.8 | 4 +- man/NetworkManager.8 | 6 +- man/NetworkManager.conf.5 | 6 +- man/nm-cloud-setup.8 | 6 +- man/nm-initrd-generator.8 | 6 +- man/nm-online.1 | 6 +- man/nm-openvswitch.7 | 6 +- man/nm-settings-dbus.5 | 122 +++--- man/nm-settings-ifcfg-rh.5 | 6 +- man/nm-settings-keyfile.5 | 6 +- man/nm-settings-nmcli.5 | 92 ++-- man/nmcli-examples.7 | 6 +- man/nmcli.1 | 6 +- man/nmtui.1 | 6 +- meson.build | 2 +- src/core/devices/nm-device.c | 27 +- src/libnm-client-impl/nm-device-hsr.c | 22 +- src/libnm-client-impl/nm-libnm-utils.c | 1 + src/libnm-client-impl/nm-libnm-utils.h | 3 +- src/libnm-client-impl/tests/test-libnm.c | 7 + src/libnm-core-impl/nm-setting-connection.c | 4 +- src/libnm-core-impl/tests/test-general.c | 2 +- src/libnmc-setting/settings-docs.h.in | 8 +- tools/generate-docs-nm-settings-docs-merge.py | 1 + 77 files changed, 726 insertions(+), 693 deletions(-) diff --git a/configure.ac b/configure.ac index b5021981..c62c9cda 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,8 @@ dnl - add corresponding NM_VERSION_x_y_z macros in dnl "shared/nm-version-macros.h.in" dnl - update number in meson.build m4_define([nm_major_version], [1]) -m4_define([nm_minor_version], [49]) -m4_define([nm_micro_version], [91]) +m4_define([nm_minor_version], [50]) +m4_define([nm_micro_version], [0]) m4_define([nm_version], [nm_major_version.nm_minor_version.nm_micro_version]) diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2 index 752eadad..2fa066ba 100644 --- a/docs/api/html/NetworkManager.devhelp2 +++ b/docs/api/html/NetworkManager.devhelp2 @@ -34,6 +34,7 @@ + @@ -70,7 +71,6 @@ - diff --git a/docs/api/html/ch01.html b/docs/api/html/ch01.html index 86b6d9b3..af0badca 100644 --- a/docs/api/html/ch01.html +++ b/docs/api/html/ch01.html @@ -66,6 +66,9 @@ gsm — GSM-based Mobile Broadband Settings
+hsr — HSR/PRP Settings +
+
infiniband — Infiniband Settings
@@ -174,9 +177,6 @@ hostname — Hostname settings
-hsr — HSR/PRP Settings -
-
link — Link settings
diff --git a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Hsr.html b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Hsr.html index 9e143820..5bc88103 100644 --- a/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Hsr.html +++ b/docs/api/html/gdbus-org.freedesktop.NetworkManager.Device.Hsr.html @@ -57,9 +57,9 @@ Port1 readable o

+The device's port1 device.

-

-

+

Since 1.46

@@ -68,9 +68,9 @@ Port1 readable o Port2 readable o

+The device's port2 device.

-

-

+

Since 1.46

@@ -79,9 +79,9 @@ Port2 readable o SupervisionAddress readable s

+The supervision MAC address.

-

-

+

Since 1.46

@@ -90,9 +90,9 @@ SupervisionAddress readable s MulticastSpec readable y

+The last byte of the supervision address.

-

-

+

Since 1.46

@@ -101,9 +101,9 @@ MulticastSpec readable y Prp readable b

+Whether the PRP protocol is used or not.

-

-

+

Since 1.46

diff --git a/docs/api/html/index.html b/docs/api/html/index.html index f6c59abc..77edfb70 100644 --- a/docs/api/html/index.html +++ b/docs/api/html/index.html @@ -16,7 +16,7 @@

- for NetworkManager 1.49.91 + for NetworkManager 1.50.0 The latest version of this documentation can be found on-line at https://networkmanager.dev/docs/api/latest/. @@ -152,6 +152,9 @@ gsm — GSM-based Mobile Broadband Settings

+hsr — HSR/PRP Settings +
+
infiniband — Infiniband Settings
@@ -260,9 +263,6 @@ hostname — Hostname settings
-hsr — HSR/PRP Settings -
-
link — Link settings
diff --git a/docs/api/html/ix01.html b/docs/api/html/ix01.html index a0a8ae4d..c5801ca3 100644 --- a/docs/api/html/ix01.html +++ b/docs/api/html/ix01.html @@ -527,7 +527,7 @@

A

-
accept-all-mac-addresses, 802-3-ethernet +
accept-all-mac-addresses, 802-3-ethernet
org.freedesktop.NetworkManager.Connection.Active, org.freedesktop.NetworkManager.Connection.Active
@@ -567,13 +567,13 @@
org.freedesktop.NetworkManager.Connection.Active:Vpn, The "Vpn" property
-
addr-gen-mode, ipv6 +
addr-gen-mode, ipv6
-
address-data, ipv4, ipv6 +
address-data, ipv4, ipv6
-
addresses, ipv4, ipv6 +
addresses, ipv4, ipv6
-
ageing, vxlan +
ageing, vxlan
ageing-time, bridge
@@ -581,7 +581,7 @@
anonymous-identity, 802-1x
-
ap-isolation, 802-11-wireless +
ap-isolation, 802-11-wireless
apn, gsm
@@ -599,9 +599,9 @@
app-iscsi-priority, dcb
-
assigned-mac-address, 802-3-ethernet, 802-11-wireless +
assigned-mac-address, 802-3-ethernet, 802-11-wireless
-
auth-alg, 802-11-wireless-security +
auth-alg, 802-11-wireless-security
auth-retries, connection
@@ -609,9 +609,9 @@
auto-config, gsm
-
auto-negotiate, 802-3-ethernet +
auto-negotiate, 802-3-ethernet
-
auto-route-ext-gw, ipv4, ipv6 +
auto-route-ext-gw, ipv4, ipv6
autoconnect, connection
@@ -623,30 +623,30 @@
autoconnect-slaves, connection
-
autoprobe-drivers, sriov +
autoprobe-drivers, sriov

B

-
band, 802-11-wireless +
band, 802-11-wireless
-
baud, ppp, serial +
baud, ppp, serial
bdaddr, bluetooth
-
bits, serial +
bits, serial
-
bond-downdelay, ovs-port +
bond-downdelay, ovs-port
-
bond-mode, ovs-port +
bond-mode, ovs-port
-
bond-updelay, ovs-port +
bond-updelay, ovs-port
-
browser-only, proxy +
browser-only, proxy
-
bssid, 802-11-wireless +
bssid, 802-11-wireless
@@ -661,9 +661,9 @@
ca-path, 802-1x
-
channel, 802-11-olpc-mesh, 802-11-wireless, wpan +
channel, 802-11-olpc-mesh, 802-11-wireless, wpan
-
channel-width, 802-11-wireless +
channel-width, 802-11-wireless
org.freedesktop.NetworkManager.Checkpoint, org.freedesktop.NetworkManager.Checkpoint
@@ -679,28 +679,28 @@
client-cert-password-flags, 802-1x
-
cloned-mac-address, 802-3-ethernet, 802-11-wireless +
cloned-mac-address, 802-3-ethernet, 802-11-wireless
-
config, team, team-port +
config, team, team-port
controller, connection
-
crtscts, ppp +
crtscts, ppp

D

-
dad-timeout, ipv4, ipv6 +
dad-timeout, ipv4, ipv6
-
data, user, vpn, ovs-external-ids, ovs-other-config +
data, user, vpn, ovs-external-ids, ovs-other-config
-
datapath-type, ovs-bridge +
datapath-type, ovs-bridge
-
destination-port, vxlan +
destination-port, vxlan
-
devargs, ovs-dpdk +
devargs, ovs-dpdk
device-handler, generic
@@ -760,33 +760,33 @@
org.freedesktop.NetworkManager.Device.WifiP2P:Peers, The "Peers" property
-
dhcp-anycast-address, 802-11-olpc-mesh +
dhcp-anycast-address, 802-11-olpc-mesh
-
dhcp-client-id, ipv4 +
dhcp-client-id, ipv4
-
dhcp-dscp, ipv4, ipv6 +
dhcp-dscp, ipv4, ipv6
-
dhcp-duid, ipv6 +
dhcp-duid, ipv6
-
dhcp-fqdn, ipv4 +
dhcp-fqdn, ipv4
-
dhcp-hostname, ipv4, ipv6 +
dhcp-hostname, ipv4, ipv6
-
dhcp-hostname-flags, ipv4, ipv6 +
dhcp-hostname-flags, ipv4, ipv6
-
dhcp-iaid, ipv4, ipv6 +
dhcp-iaid, ipv4, ipv6
-
dhcp-pd-hint, ipv6 +
dhcp-pd-hint, ipv6
-
dhcp-reject-servers, ipv4, ipv6 +
dhcp-reject-servers, ipv4, ipv6
-
dhcp-send-hostname, ipv4, ipv6 +
dhcp-send-hostname, ipv4, ipv6
-
dhcp-send-release, ipv4, ipv6 +
dhcp-send-release, ipv4, ipv6
-
dhcp-timeout, ipv4, ipv6 +
dhcp-timeout, ipv4, ipv6
-
dhcp-vendor-class-identifier, ipv4 +
dhcp-vendor-class-identifier, ipv4
org.freedesktop.NetworkManager.DHCP4Config, org.freedesktop.NetworkManager.DHCP4Config
@@ -796,17 +796,17 @@
org.freedesktop.NetworkManager.DHCP6Config:Options, The "Options" property
-
dns, ipv4, ipv6 +
dns, ipv4, ipv6
-
dns-data, ipv4, ipv6 +
dns-data, ipv4, ipv6
-
dns-options, ipv4, ipv6 +
dns-options, ipv4, ipv6
dns-over-tls, connection
-
dns-priority, ipv4, ipv6 +
dns-priority, ipv4, ipv6
-
dns-search, ipv4, ipv6 +
dns-search, ipv4, ipv6
domain-match, 802-1x
@@ -814,9 +814,9 @@
down-on-poweroff, connection
-
driver, match +
driver, match
-
duplex, 802-3-ethernet +
duplex, 802-3-ethernet
@@ -825,55 +825,55 @@
eap, 802-1x
-
egress-priority-map, vlan +
egress-priority-map, vlan
encapsulation, adsl
-
encapsulation-limit, ip-tunnel +
encapsulation-limit, ip-tunnel
-
encrypt, macsec +
encrypt, macsec
-
eswitch-encap-mode, sriov +
eswitch-encap-mode, sriov
-
eswitch-inline-mode, sriov +
eswitch-inline-mode, sriov
-
eswitch-mode, sriov +
eswitch-mode, sriov

F

-
fail-mode, ovs-bridge +
fail-mode, ovs-bridge
-
fils, 802-11-wireless-security +
fils, 802-11-wireless-security
-
flags, ip-tunnel, vlan +
flags, ip-tunnel, vlan
-
flow-label, ip-tunnel +
flow-label, ip-tunnel
forward-delay, bridge
-
from-dhcp, hostname +
from-dhcp, hostname
-
from-dns-lookup, hostname +
from-dns-lookup, hostname
-
fwmark, ip-tunnel, wireguard +
fwmark, ip-tunnel, wireguard

G

-
gateway, ipv4, ipv6 +
gateway, ipv4, ipv6
gateway-ping-timeout, connection
-
generate-mac-address-mask, 802-3-ethernet, 802-11-wireless +
generate-mac-address-mask, 802-3-ethernet, 802-11-wireless
gro-max-size, link
-
group, tun, 802-11-wireless-security +
group, tun, 802-11-wireless-security
group-address, bridge
@@ -892,7 +892,7 @@
hello-time, bridge
-
hidden, 802-11-wireless +
hidden, 802-11-wireless
home-only, gsm
@@ -905,75 +905,75 @@
identity, 802-1x
-
ignore-auto-dns, ipv4, ipv6 +
ignore-auto-dns, ipv4, ipv6
-
ignore-auto-routes, ipv4, ipv6 +
ignore-auto-routes, ipv4, ipv6
-
ingress-priority-map, vlan +
ingress-priority-map, vlan
initial-eps-bearer-apn, gsm
initial-eps-bearer-configure, gsm
-
input-key, ip-tunnel +
input-key, ip-tunnel
interface-name, connection, bond, bridge, match, team, vlan
-
ip4-auto-default-route, wireguard +
ip4-auto-default-route, wireguard
-
ip6-auto-default-route, wireguard +
ip6-auto-default-route, wireguard
-
ip6-privacy, ipv6 +
ip6-privacy, ipv6

K

-
kernel-command-line, match +
kernel-command-line, match
-
key-mgmt, 802-11-wireless-security +
key-mgmt, 802-11-wireless-security

L

-
l2-miss, vxlan +
l2-miss, vxlan
-
l3-miss, vxlan +
l3-miss, vxlan
-
lacp, ovs-port +
lacp, ovs-port
-
lacp-key, team-port +
lacp-key, team-port
-
lacp-prio, team-port +
lacp-prio, team-port
-
lcp-echo-failure, ppp +
lcp-echo-failure, ppp
-
lcp-echo-interval, ppp +
lcp-echo-interval, ppp
-
leap-password, 802-11-wireless-security +
leap-password, 802-11-wireless-security
-
leap-password-flags, 802-11-wireless-security +
leap-password-flags, 802-11-wireless-security
-
leap-username, 802-11-wireless-security +
leap-username, 802-11-wireless-security
-
learning, vxlan +
learning, vxlan
-
limit, vxlan +
limit, vxlan
-
link-local, ipv4 +
link-local, ipv4
-
link-watchers, team, team-port +
link-watchers, team, team-port
-
listen-port, wireguard +
listen-port, wireguard
lldp, connection
llmnr, connection
-
local, ip-tunnel, vxlan +
local, ip-tunnel, vxlan
@@ -982,11 +982,11 @@
mac-address, bridge, infiniband, wimax, 802-3-ethernet, 802-11-wireless, wpan
-
mac-address-blacklist, 802-3-ethernet, 802-11-wireless +
mac-address-blacklist, 802-3-ethernet, 802-11-wireless
-
mac-address-denylist, 802-3-ethernet, 802-11-wireless +
mac-address-denylist, 802-3-ethernet, 802-11-wireless
-
mac-address-randomization, 802-11-wireless +
mac-address-randomization, 802-11-wireless
org.freedesktop.NetworkManager, org.freedesktop.NetworkManager
@@ -1092,33 +1092,33 @@
max-age, bridge
-
may-fail, ipv4, ipv6 +
may-fail, ipv4, ipv6
-
mcast-rejoin-count, team +
mcast-rejoin-count, team
-
mcast-rejoin-interval, team +
mcast-rejoin-interval, team
-
mcast-snooping-enable, ovs-bridge +
mcast-snooping-enable, ovs-bridge
mdns, connection
metered, connection
-
method, ipv4, ipv6, proxy +
method, ipv4, ipv6, proxy
-
mka-cak, macsec +
mka-cak, macsec
-
mka-cak-flags, macsec +
mka-cak-flags, macsec
-
mka-ckn, macsec +
mka-ckn, macsec
-
mode, ip-tunnel, macsec, macvlan, tun, 802-11-wireless +
mode, ip-tunnel, macsec, macvlan, tun, 802-11-wireless
-
mppe-stateful, ppp +
mppe-stateful, ppp
mptcp-flags, connection
-
mru, ppp +
mru, ppp
mtu, cdma, gsm, infiniband, ipv6, ip-tunnel, ppp, 802-3-ethernet, wireguard, 802-11-wireless, loopback
@@ -1126,7 +1126,7 @@
multi-connect, connection
-
multi-queue, tun +
multi-queue, tun
multicast-hash-max, bridge
@@ -1150,7 +1150,7 @@
multicast-snooping, bridge
-
multicast-spec, hsr +
multicast-spec, hsr
multicast-startup-query-count, bridge
@@ -1161,17 +1161,17 @@

N

-
n-rxq, ovs-dpdk +
n-rxq, ovs-dpdk
-
n-rxq-desc, ovs-dpdk +
n-rxq-desc, ovs-dpdk
-
n-txq-desc, ovs-dpdk +
n-txq-desc, ovs-dpdk
network-id, gsm
-
network-name, wimax +
network-name, wimax
-
never-default, ipv4, ipv6 +
never-default, ipv4, ipv6
NM80211ApFlags, enum NM80211ApFlags
@@ -1253,17 +1253,17 @@
NMWimaxNspNetworkType, enum NMWimaxNspNetworkType
-
no-vj-comp, ppp +
no-vj-comp, ppp
-
noauth, ppp +
noauth, ppp
-
nobsdcomp, ppp +
nobsdcomp, ppp
-
nodeflate, ppp +
nodeflate, ppp
-
notify-peers-count, team +
notify-peers-count, team
-
notify-peers-interval, team +
notify-peers-interval, team
number, cdma, gsm
@@ -1272,11 +1272,11 @@

O

-
offload, macsec +
offload, macsec
-
ofport-request, ovs-interface +
ofport-request, ovs-interface
-
only-from-default, hostname +
only-from-default, hostname
openssl-ciphers, 802-1x
@@ -1284,32 +1284,32 @@
options, bond
-
output-key, ip-tunnel +
output-key, ip-tunnel
-
owner, tun +
owner, tun

P

-
p-key, infiniband +
p-key, infiniband
pac-file, 802-1x
-
pac-script, proxy +
pac-script, proxy
-
pac-url, proxy +
pac-url, proxy
-
page, wpan +
page, wpan
-
pairwise, 802-11-wireless-security +
pairwise, 802-11-wireless-security
-
pan-id, wpan +
pan-id, wpan
parent, 6lowpan, infiniband, ip-tunnel, macsec, macvlan, pppoe, vlan, vxlan
-
parity, serial +
parity, serial
password, 802-1x, adsl, cdma, gsm, pppoe
@@ -1319,21 +1319,21 @@
password-raw-flags, 802-1x
-
path, match +
path, match
path-cost, bridge-port
-
path-mtu-discovery, ip-tunnel +
path-mtu-discovery, ip-tunnel
-
peer, ovs-patch, wifi-p2p, veth +
peer, ovs-patch, wifi-p2p, veth
-
peer-routes, wireguard +
peer-routes, wireguard
-
peers, wireguard +
peers, wireguard
permissions, connection
-
persistent, vpn +
persistent, vpn
phase1-auth-flags, 802-1x
@@ -1375,23 +1375,23 @@
phase2-subject-match, 802-1x
-
pi, tun +
pi, tun
pin, 802-1x, gsm
pin-flags, 802-1x, gsm
-
pmf, 802-11-wireless-security +
pmf, 802-11-wireless-security
-
port, macsec, 802-3-ethernet +
port, macsec, 802-3-ethernet
port-type, connection
-
port1, hsr +
port1, hsr
-
port2, hsr +
port2, hsr
-
powersave, 802-11-wireless +
powersave, 802-11-wireless
org.freedesktop.NetworkManager.PPP, org.freedesktop.NetworkManager.PPP
@@ -1405,7 +1405,7 @@
org.freedesktop.NetworkManager.PPP.SetState(), The SetState() method
-
prio, team-port, bond-port +
prio, team-port, bond-port
priority, bridge, bridge-port, hostname
@@ -1427,128 +1427,128 @@
private-key, 802-1x, wireguard
-
private-key-flags, wireguard +
private-key-flags, wireguard
private-key-password, 802-1x
private-key-password-flags, 802-1x
-
promiscuous, macvlan +
promiscuous, macvlan
-
proto, 802-11-wireless-security +
proto, 802-11-wireless-security
protocol, adsl, vlan
-
proxy, vxlan +
proxy, vxlan
-
prp, hsr +
prp, hsr
-
psk, 802-11-wireless-security +
psk, 802-11-wireless-security
-
psk-flags, 802-11-wireless-security +
psk-flags, 802-11-wireless-security

Q

-
qdiscs, tc +
qdiscs, tc
-
queue-id, team-port, bond-port +
queue-id, team-port, bond-port

R

-
ra-timeout, ipv6 +
ra-timeout, ipv6
-
rate, 802-11-wireless +
rate, 802-11-wireless
read-only, connection
-
refuse-chap, ppp +
refuse-chap, ppp
-
refuse-eap, ppp +
refuse-eap, ppp
-
refuse-mschap, ppp +
refuse-mschap, ppp
-
refuse-mschapv2, ppp +
refuse-mschapv2, ppp
-
refuse-pap, ppp +
refuse-pap, ppp
-
remote, ip-tunnel, vxlan +
remote, ip-tunnel, vxlan
-
replace-local-rule, ipv4, ipv6 +
replace-local-rule, ipv4, ipv6
-
require-mppe, ppp +
require-mppe, ppp
-
require-mppe-128, ppp +
require-mppe-128, ppp
-
required-timeout, ipv4, ipv6 +
required-timeout, ipv4, ipv6
-
route-data, ipv4, ipv6 +
route-data, ipv4, ipv6
-
route-metric, ipv4, ipv6 +
route-metric, ipv4, ipv6
-
route-table, ipv4, ipv6 +
route-table, ipv4, ipv6
-
routes, ipv4, ipv6 +
routes, ipv4, ipv6
-
routing-rules, ipv4, ipv6 +
routing-rules, ipv4, ipv6
-
rsc, vxlan +
rsc, vxlan
-
rstp-enable, ovs-bridge +
rstp-enable, ovs-bridge
-
runner, team +
runner, team
-
runner-active, team +
runner-active, team
-
runner-agg-select-policy, team +
runner-agg-select-policy, team
-
runner-fast-rate, team +
runner-fast-rate, team
-
runner-hwaddr-policy, team +
runner-hwaddr-policy, team
-
runner-min-ports, team +
runner-min-ports, team
-
runner-sys-prio, team +
runner-sys-prio, team
-
runner-tx-balancer, team +
runner-tx-balancer, team
-
runner-tx-balancer-interval, team +
runner-tx-balancer-interval, team
-
runner-tx-hash, team +
runner-tx-hash, team

S

-
s390-nettype, 802-3-ethernet +
s390-nettype, 802-3-ethernet
-
s390-options, 802-3-ethernet +
s390-options, 802-3-ethernet
-
s390-subchannels, 802-3-ethernet +
s390-subchannels, 802-3-ethernet
secondaries, connection
-
secrets, vpn +
secrets, vpn
-
security, 802-11-wireless +
security, 802-11-wireless
-
seen-bssids, 802-11-wireless +
seen-bssids, 802-11-wireless
-
send-delay, serial +
send-delay, serial
-
send-sci, macsec +
send-sci, macsec
-
service, pppoe +
service, pppoe
-
service-type, vpn +
service-type, vpn
-
short-address, wpan +
short-address, wpan
sim-id, gsm
@@ -1556,23 +1556,23 @@
slave-type, connection
-
source-port-max, vxlan +
source-port-max, vxlan
-
source-port-min, vxlan +
source-port-min, vxlan
-
speed, 802-3-ethernet +
speed, 802-3-ethernet
-
ssid, 802-11-olpc-mesh, 802-11-wireless +
ssid, 802-11-olpc-mesh, 802-11-wireless
stable-id, connection
-
sticky, team-port +
sticky, team-port
-
stopbits, serial +
stopbits, serial
stp, bridge
-
stp-enable, ovs-bridge +
stp-enable, ovs-bridge
subject-match, 802-1x
@@ -1583,35 +1583,35 @@

T

-
table, vrf +
table, vrf
-
tag, ovs-port +
tag, ovs-port
-
tap, macvlan +
tap, macvlan
-
temp-preferred-lifetime, ipv6 +
temp-preferred-lifetime, ipv6
-
temp-valid-lifetime, ipv6 +
temp-valid-lifetime, ipv6
-
tfilters, tc +
tfilters, tc
-
timeout, vpn +
timeout, vpn
timestamp, connection
-
token, ipv6 +
token, ipv6
-
tos, ip-tunnel, vxlan +
tos, ip-tunnel, vxlan
-
total-vfs, sriov +
total-vfs, sriov
-
transport-mode, infiniband +
transport-mode, infiniband
-
trunks, ovs-port +
trunks, ovs-port
-
ttl, ip-tunnel, vxlan +
ttl, ip-tunnel, vxlan
-
tx-power, 802-11-wireless +
tx-power, 802-11-wireless
tx-queue-length, link
@@ -1622,7 +1622,7 @@

U

-
user-name, vpn +
user-name, vpn
username, adsl, cdma, gsm, pppoe
@@ -1633,17 +1633,17 @@

V

-
validation, macsec +
validation, macsec
vci, adsl
-
vfs, sriov +
vfs, sriov
vlan-default-pvid, bridge
vlan-filtering, bridge
-
vlan-mode, ovs-port +
vlan-mode, ovs-port
vlan-protocol, bridge
@@ -1651,7 +1651,7 @@
vlans, bridge, bridge-port
-
vnet-hdr, tun +
vnet-hdr, tun
vpi, adsl
@@ -1708,27 +1708,27 @@
wait-device-timeout, connection
-
wake-on-lan, 802-3-ethernet +
wake-on-lan, 802-3-ethernet
-
wake-on-lan-password, 802-3-ethernet +
wake-on-lan-password, 802-3-ethernet
-
wake-on-wlan, 802-11-wireless +
wake-on-wlan, 802-11-wireless
-
wep-key-flags, 802-11-wireless-security +
wep-key-flags, 802-11-wireless-security
-
wep-key-type, 802-11-wireless-security +
wep-key-type, 802-11-wireless-security
-
wep-key0, 802-11-wireless-security +
wep-key0, 802-11-wireless-security
-
wep-key1, 802-11-wireless-security +
wep-key1, 802-11-wireless-security
-
wep-key2, 802-11-wireless-security +
wep-key2, 802-11-wireless-security
-
wep-key3, 802-11-wireless-security +
wep-key3, 802-11-wireless-security
-
wep-tx-keyidx, 802-11-wireless-security +
wep-tx-keyidx, 802-11-wireless-security
-
wfd-ies, wifi-p2p +
wfd-ies, wifi-p2p
org.freedesktop.NetworkManager.WifiP2PPeer, org.freedesktop.NetworkManager.WifiP2PPeer
@@ -1752,7 +1752,7 @@
org.freedesktop.NetworkManager.WifiP2PPeer:WfdIEs, The "WfdIEs" property
-
wps-method, wifi-p2p, 802-11-wireless-security +
wps-method, wifi-p2p, 802-11-wireless-security
diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html index d5f84012..743d8447 100644 --- a/docs/api/html/nm-settings-dbus.html +++ b/docs/api/html/nm-settings-dbus.html @@ -1643,7 +1643,56 @@ This property is deprecated since version 1.16.User-provided values for this set
-

infiniband setting

+

hsr setting

+

HSR/PRP Settings.

+
++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Key NameValue TypeDefault ValueValue Description
+multicast-specuint320The last byte of supervision address.
+port1string The port1 interface name of the HSR. This property is mandatory.
+port2string The port2 interface name of the HSR. This property is mandatory.
+prpbooleanFALSEThe protocol used by the interface, whether it is PRP or HSR.
+
+
+
+

infiniband setting

Infiniband Settings.

@@ -1703,7 +1752,7 @@ Note that kernel will internally always set the full membership bit, although th
-

ipv4 setting

+

ipv4 setting

IPv4 Settings.

@@ -2052,7 +2101,7 @@ Array of IPv4 route structures. Each IPv4 route structure is composed of 4 32-b
-

ipv6 setting

+

ipv6 setting

IPv6 Settings.

@@ -2454,7 +2503,7 @@ When set, the token is used as IPv6 interface identifier instead of the hardware
-

ip-tunnel setting

+

ip-tunnel setting

IP Tunneling Settings.

@@ -2573,7 +2622,7 @@ When set, the token is used as IPv6 interface identifier instead of the hardware
-

macsec setting

+

macsec setting

MACSec Settings.

@@ -2670,7 +2719,7 @@ When set, the token is used as IPv6 interface identifier instead of the hardware
-

macvlan setting

+

macvlan setting

MAC VLAN Settings.

@@ -2719,7 +2768,7 @@ When set, the token is used as IPv6 interface identifier instead of the hardware
-

match setting

+

match setting

Match settings.

@@ -2782,7 +2831,7 @@ See NMSettingMatch:interface-name for how special characters '|', '&', '!' a
-

802-11-olpc-mesh setting

+

802-11-olpc-mesh setting

OLPC Wireless Mesh Settings.

@@ -2826,7 +2875,7 @@ This is currently only implemented by dhclient DHCP plugin.
-

ovs-bridge setting

+

ovs-bridge setting

OvsBridge Link Settings.

@@ -2882,7 +2931,7 @@ This is currently only implemented by dhclient DHCP plugin.
-

ovs-dpdk setting

+

ovs-dpdk setting

OvsDpdk Link Settings.

@@ -2931,7 +2980,7 @@ This is currently only implemented by dhclient DHCP plugin.
-

ovs-interface setting

+

ovs-interface setting

Open vSwitch Interface Settings.

@@ -2966,7 +3015,7 @@ This is currently only implemented by dhclient DHCP plugin.
-

ovs-patch setting

+

ovs-patch setting

OvsPatch Link Settings.

@@ -2992,7 +3041,7 @@ This is currently only implemented by dhclient DHCP plugin.
-

ovs-port setting

+

ovs-port setting

OvsPort Link Settings.

@@ -3064,7 +3113,7 @@ The property is valid only for ports with mode "trunk", "native-tagged", or "nat
-

ppp setting

+

ppp setting

Point-to-Point Protocol Settings.

@@ -3211,7 +3260,7 @@ The property is valid only for ports with mode "trunk", "native-tagged", or "nat
-

pppoe setting

+

pppoe setting

PPP-over-Ethernet Settings.

@@ -3267,7 +3316,7 @@ The property is valid only for ports with mode "trunk", "native-tagged", or "nat
-

proxy setting

+

proxy setting

WWW Proxy Settings.

@@ -3316,7 +3365,7 @@ The property is valid only for ports with mode "trunk", "native-tagged", or "nat
-

serial setting

+

serial setting

Serial Link Settings.

@@ -3372,7 +3421,7 @@ The property is valid only for ports with mode "trunk", "native-tagged", or "nat
-

sriov setting

+

sriov setting

SR-IOV settings.

@@ -3471,7 +3520,7 @@ PROTO can be either 'q' for 802.1Q (the default) or 'ad' for 802.1ad.
-

tc setting

+

tc setting

Linux Traffic Control Settings.

@@ -3514,7 +3563,7 @@ If the "tc" setting is not present, NetworkManager doesn't touch the filters pre
-

team setting

+

team setting

Teaming Settings.

@@ -3654,7 +3703,7 @@ If the "tc" setting is not present, NetworkManager doesn't touch the filters pre
-

team-port setting

+

team-port setting

Team Port Settings.

@@ -3724,7 +3773,7 @@ If the "tc" setting is not present, NetworkManager doesn't touch the filters pre
-

tun setting

+

tun setting

Tunnel Settings.

@@ -3787,7 +3836,7 @@ If the "tc" setting is not present, NetworkManager doesn't touch the filters pre
-

user setting

+

user setting

General User Profile Settings.

@@ -3813,7 +3862,7 @@ If the "tc" setting is not present, NetworkManager doesn't touch the filters pre
-

vlan setting

+

vlan setting

VLAN Settings.

@@ -3887,7 +3936,7 @@ Supported values are: '802.1Q', '802.1ad'. If not specified the default value is
-

vpn setting

+

vpn setting

VPN Settings.

@@ -3950,7 +3999,7 @@ Supported values are: '802.1Q', '802.1ad'. If not specified the default value is
-

vrf setting

+

vrf setting

VRF settings.

@@ -3976,7 +4025,7 @@ Supported values are: '802.1Q', '802.1ad'. If not specified the default value is
-

vxlan setting

+

vxlan setting

VXLAN Settings.

@@ -4109,7 +4158,7 @@ Supported values are: '802.1Q', '802.1ad'. If not specified the default value is
-

wifi-p2p setting

+

wifi-p2p setting

Wi-Fi P2P Settings.

@@ -4155,7 +4204,7 @@ There's little point in changing the default setting as NetworkManager will auto
-

wimax setting

+

wimax setting

WiMax Settings.

@@ -4194,7 +4243,7 @@ This property is deprecated since version 1.2.WiMAX is no longer supported.
-

802-3-ethernet setting

+

802-3-ethernet setting

Wired Ethernet Settings.

@@ -4344,7 +4393,7 @@ Currently, NetworkManager itself does nothing with this information. However, s3
-

wireguard setting

+

wireguard setting

WireGuard Settings.

@@ -4438,7 +4487,7 @@ Note that if the peer's AllowedIPs is "0.0.0.0/0" or "::/0" and the profile's ip
-

802-11-wireless setting

+

802-11-wireless setting

Wi-Fi Settings.

@@ -4649,7 +4698,7 @@ This property is deprecated since version 1.44.This property is not implemented
-

802-11-wireless-security setting

+

802-11-wireless-security setting

Wi-Fi Security Settings.

@@ -4816,7 +4865,7 @@ WPS can be disabled by setting this property to a value of 1.
-

wpan setting

+

wpan setting

IEEE 802.15.4 (WPAN) MAC Settings.

@@ -4872,7 +4921,7 @@ WPS can be disabled by setting this property to a value of 1.
-

bond-port setting

+

bond-port setting

Bond Port Settings.

@@ -4907,7 +4956,7 @@ WPS can be disabled by setting this property to a value of 1.
-

hostname setting

+

hostname setting

Hostname settings.

@@ -4968,55 +5017,6 @@ Negative values have the special effect of excluding other connections with a gr
-

hsr setting

-

HSR/PRP Settings.

-
------ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Key NameValue TypeDefault ValueValue Description
-multicast-specuint320The last byte of supervision address.
-port1string The port1 interface name of the HSR. This property is mandatory.
-port2string The port2 interface name of the HSR. This property is mandatory.
-prpbooleanFALSEThe protocol used by the interface, whether it is PRP or HSR.
-
-
-

link setting

Link settings.

diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html index c691d7d4..4e447a36 100644 --- a/docs/api/html/nm-settings-nmcli.html +++ b/docs/api/html/nm-settings-nmcli.html @@ -2692,7 +2692,65 @@
-

infiniband setting

+

hsr setting

+

HSR/PRP Settings.

+

+ Properties: +

+
++++ + + + + + + + + + + + + + + + + + + +

hsr.multicast-spec

 +

+ Alias: multicast-spec

+

The last byte of supervision address.

+

+ Format: integer

+

+ Valid values: 0 - 255

+

hsr.port1

 +

+ Alias: port1

+

The port1 interface name of the HSR. This property is mandatory.

+

+ Format: string

+

hsr.port2

 +

+ Alias: port2

+

The port2 interface name of the HSR. This property is mandatory.

+

+ Format: string

+

hsr.prp

 +

The protocol used by the interface, whether it is PRP or HSR.

+

+ Format: boolean

+

+ Valid values: true/yes/on, false/no/off

+
+
+
+
+

infiniband setting

Infiniband Settings.

Properties: @@ -2768,7 +2826,7 @@

-

ipv4 setting

+

ipv4 setting

IPv4 Settings.

Properties: @@ -3198,7 +3256,7 @@ Example: priority 5 from 192.167.4.0/24 table 45

-

ipv6 setting

+

ipv6 setting

IPv6 Settings.

Properties: @@ -3646,7 +3704,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

ip-tunnel setting

+

ip-tunnel setting

IP Tunneling Settings.

Properties: @@ -3800,7 +3858,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

macsec setting

+

macsec setting

MACSec Settings.

Properties: @@ -3925,7 +3983,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

macvlan setting

+

macvlan setting

MAC VLAN Settings.

Properties: @@ -3985,7 +4043,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

match setting

+

match setting

Match settings.

Properties: @@ -4040,7 +4098,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

802-11-olpc-mesh setting

+

802-11-olpc-mesh setting

Alias: olpc-mesh

OLPC Wireless Mesh Settings.

@@ -4091,7 +4149,7 @@ Example: priority 5 from 1:2:3::5/128 table 45
-

ovs-bridge setting

+

ovs-bridge setting

OvsBridge Link Settings.

Properties: @@ -4157,7 +4215,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

ovs-dpdk setting

+

ovs-dpdk setting

OvsDpdk Link Settings.

Properties: @@ -4211,7 +4269,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

ovs-interface setting

+

ovs-interface setting

Open vSwitch Interface Settings.

Properties: @@ -4247,7 +4305,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

ovs-patch setting

+

ovs-patch setting

OvsPatch Link Settings.

Properties: @@ -4269,7 +4327,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

ovs-port setting

+

ovs-port setting

OvsPort Link Settings.

Properties: @@ -4354,7 +4412,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

ppp setting

+

ppp setting

Point-to-Point Protocol Settings.

Properties: @@ -4550,7 +4608,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

pppoe setting

+

pppoe setting

PPP-over-Ethernet Settings.

Properties: @@ -4616,7 +4674,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

proxy setting

+

proxy setting

WWW Proxy Settings.

Properties: @@ -4676,7 +4734,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

serial setting

+

serial setting

Serial Link Settings.

Properties: @@ -4742,7 +4800,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

sriov setting

+

sriov setting

SR-IOV settings.

Properties: @@ -4834,7 +4892,7 @@ Example: priority 5 from 1:2:3::5/128 table 45

-

tc setting

+

tc setting

Linux Traffic Control Settings.

Properties: @@ -5211,7 +5269,7 @@ Linux traffic control subsystem

-

team setting

+

team setting

Teaming Settings.

Properties: @@ -5399,7 +5457,7 @@ Linux traffic control subsystem

-

team-port setting

+

team-port setting

Team Port Settings.

Properties: @@ -5491,7 +5549,7 @@ Linux traffic control subsystem

-

tun setting

+

tun setting

Tunnel Settings.

Properties: @@ -5575,7 +5633,7 @@ Linux traffic control subsystem

-

vlan setting

+

vlan setting

VLAN Settings.

Properties: @@ -5657,7 +5715,7 @@ Linux traffic control subsystem

-

vpn setting

+

vpn setting

VPN Settings.

Properties: @@ -5729,7 +5787,7 @@ Linux traffic control subsystem

-

vrf setting

+

vrf setting

VRF settings.

Properties: @@ -5755,7 +5813,7 @@ Linux traffic control subsystem

-

vxlan setting

+

vxlan setting

VXLAN Settings.

Properties: @@ -5939,7 +5997,7 @@ Linux traffic control subsystem

-

wifi-p2p setting

+

wifi-p2p setting

Wi-Fi P2P Settings.

Properties: @@ -5985,7 +6043,7 @@ Linux traffic control subsystem

-

wimax setting

+

wimax setting

WiMax Settings.

Properties: @@ -6027,7 +6085,7 @@ Linux traffic control subsystem

-

802-3-ethernet setting

+

802-3-ethernet setting

Alias: ethernet

Wired Ethernet Settings.

@@ -6203,7 +6261,7 @@ Linux traffic control subsystem
-

wireguard setting

+

wireguard setting

WireGuard Settings.

Properties: @@ -6302,7 +6360,7 @@ Linux traffic control subsystem

-

802-11-wireless setting

+

802-11-wireless setting

Alias: wifi

Wi-Fi Settings.

@@ -6517,7 +6575,7 @@ Linux traffic control subsystem
-

802-11-wireless-security setting

+

802-11-wireless-security setting

Alias: wifi-sec

Wi-Fi Security Settings.

@@ -6724,7 +6782,7 @@ Linux traffic control subsystem
-

wpan setting

+

wpan setting

IEEE 802.15.4 (WPAN) MAC Settings.

Properties: @@ -6806,7 +6864,7 @@ Linux traffic control subsystem

-

bond-port setting

+

bond-port setting

Bond Port Settings.

Properties: @@ -6846,7 +6904,7 @@ Linux traffic control subsystem

-

hostname setting

+

hostname setting

Hostname settings.

Properties: @@ -6908,64 +6966,6 @@ Linux traffic control subsystem

-

hsr setting

-

HSR/PRP Settings.

-

- Properties: -

-
---- - - - - - - - - - - - - - - - - - - -

hsr.multicast-spec

 -

- Alias: multicast-spec

-

The last byte of supervision address.

-

- Format: integer

-

- Valid values: 0 - 255

-

hsr.port1

 -

- Alias: port1

-

The port1 interface name of the HSR. This property is mandatory.

-

- Format: string

-

hsr.port2

 -

- Alias: port2

-

The port2 interface name of the HSR. This property is mandatory.

-

- Format: string

-

hsr.prp

 -

The protocol used by the interface, whether it is PRP or HSR.

-

- Format: boolean

-

- Valid values: true/yes/on, false/no/off

-
-
-
-

link setting

Link settings.

diff --git a/docs/api/html/ref-settings.html b/docs/api/html/ref-settings.html index 77e1fe43..90513d09 100644 --- a/docs/api/html/ref-settings.html +++ b/docs/api/html/ref-settings.html @@ -70,6 +70,9 @@ gsm — GSM-based Mobile Broadband Settings

+hsr — HSR/PRP Settings +
+
infiniband — Infiniband Settings
@@ -178,9 +181,6 @@ hostname — Hostname settings
-hsr — HSR/PRP Settings -
-
link — Link settings
diff --git a/docs/api/html/settings-802-11-olpc-mesh.html b/docs/api/html/settings-802-11-olpc-mesh.html index 4cadce70..0a242ac4 100644 --- a/docs/api/html/settings-802-11-olpc-mesh.html +++ b/docs/api/html/settings-802-11-olpc-mesh.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 58. 

+

Table 59. 

diff --git a/docs/api/html/settings-802-11-wireless-security.html b/docs/api/html/settings-802-11-wireless-security.html index 3f873425..e7c37d7e 100644 --- a/docs/api/html/settings-802-11-wireless-security.html +++ b/docs/api/html/settings-802-11-wireless-security.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 83. 

+

Table 84. 

diff --git a/docs/api/html/settings-802-11-wireless.html b/docs/api/html/settings-802-11-wireless.html index 72685034..07492527 100644 --- a/docs/api/html/settings-802-11-wireless.html +++ b/docs/api/html/settings-802-11-wireless.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 82. 

+

Table 83. 

diff --git a/docs/api/html/settings-802-3-ethernet.html b/docs/api/html/settings-802-3-ethernet.html index 8f39f86f..ff20cdb0 100644 --- a/docs/api/html/settings-802-3-ethernet.html +++ b/docs/api/html/settings-802-3-ethernet.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 80. 

+

Table 81. 

diff --git a/docs/api/html/settings-bond-port.html b/docs/api/html/settings-bond-port.html index 895d164f..946f267a 100644 --- a/docs/api/html/settings-bond-port.html +++ b/docs/api/html/settings-bond-port.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 85. 

+

Table 86. 

diff --git a/docs/api/html/settings-gsm.html b/docs/api/html/settings-gsm.html index 9230cffb..a352876a 100644 --- a/docs/api/html/settings-gsm.html +++ b/docs/api/html/settings-gsm.html @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - +
Home Up PrevNextNext
diff --git a/docs/api/html/settings-hostname.html b/docs/api/html/settings-hostname.html index fd40b069..a2fb95e8 100644 --- a/docs/api/html/settings-hostname.html +++ b/docs/api/html/settings-hostname.html @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ Home Up Prev -Next +Next
@@ -34,11 +34,11 @@
-

+

Properties

-

Table 86. 

+

Table 87. 

diff --git a/docs/api/html/settings-hsr.html b/docs/api/html/settings-hsr.html index 42febdbc..6d3190ab 100644 --- a/docs/api/html/settings-hsr.html +++ b/docs/api/html/settings-hsr.html @@ -6,8 +6,8 @@ - - + + @@ -21,8 +21,8 @@ - - + +
Home UpPrevNextPrevNext
@@ -34,11 +34,11 @@
-

+

Properties

-

Table 87. 

+

Table 51. 

diff --git a/docs/api/html/settings-infiniband.html b/docs/api/html/settings-infiniband.html index 106ab7f9..87ca0af5 100644 --- a/docs/api/html/settings-infiniband.html +++ b/docs/api/html/settings-infiniband.html @@ -6,7 +6,7 @@ - + @@ -21,7 +21,7 @@ - +
Home UpPrevPrev Next
@@ -34,11 +34,11 @@
-

+

Properties

-

Table 51. 

+

Table 52. 

diff --git a/docs/api/html/settings-ip-tunnel.html b/docs/api/html/settings-ip-tunnel.html index fd5b8263..e0e50f35 100644 --- a/docs/api/html/settings-ip-tunnel.html +++ b/docs/api/html/settings-ip-tunnel.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 54. 

+

Table 55. 

diff --git a/docs/api/html/settings-ipv4.html b/docs/api/html/settings-ipv4.html index f973f1f8..b74760f1 100644 --- a/docs/api/html/settings-ipv4.html +++ b/docs/api/html/settings-ipv4.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 52. 

+

Table 53. 

diff --git a/docs/api/html/settings-ipv6.html b/docs/api/html/settings-ipv6.html index 8174924a..4bc451e7 100644 --- a/docs/api/html/settings-ipv6.html +++ b/docs/api/html/settings-ipv6.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 53. 

+

Table 54. 

diff --git a/docs/api/html/settings-link.html b/docs/api/html/settings-link.html index bb06946e..d28b27f5 100644 --- a/docs/api/html/settings-link.html +++ b/docs/api/html/settings-link.html @@ -6,7 +6,7 @@ - + @@ -21,7 +21,7 @@ - +
Home UpPrevPrev Next
diff --git a/docs/api/html/settings-macsec.html b/docs/api/html/settings-macsec.html index c8960978..d9efb8af 100644 --- a/docs/api/html/settings-macsec.html +++ b/docs/api/html/settings-macsec.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 55. 

+

Table 56. 

diff --git a/docs/api/html/settings-macvlan.html b/docs/api/html/settings-macvlan.html index a0528f89..70b7c963 100644 --- a/docs/api/html/settings-macvlan.html +++ b/docs/api/html/settings-macvlan.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 56. 

+

Table 57. 

diff --git a/docs/api/html/settings-match.html b/docs/api/html/settings-match.html index 11db056f..79b18f1a 100644 --- a/docs/api/html/settings-match.html +++ b/docs/api/html/settings-match.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 57. 

+

Table 58. 

diff --git a/docs/api/html/settings-ovs-bridge.html b/docs/api/html/settings-ovs-bridge.html index 2a41354b..437a719e 100644 --- a/docs/api/html/settings-ovs-bridge.html +++ b/docs/api/html/settings-ovs-bridge.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 59. 

+

Table 60. 

diff --git a/docs/api/html/settings-ovs-dpdk.html b/docs/api/html/settings-ovs-dpdk.html index 8b29995e..a7f9a880 100644 --- a/docs/api/html/settings-ovs-dpdk.html +++ b/docs/api/html/settings-ovs-dpdk.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 60. 

+

Table 61. 

diff --git a/docs/api/html/settings-ovs-interface.html b/docs/api/html/settings-ovs-interface.html index b672a4af..937bf965 100644 --- a/docs/api/html/settings-ovs-interface.html +++ b/docs/api/html/settings-ovs-interface.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 61. 

+

Table 62. 

diff --git a/docs/api/html/settings-ovs-patch.html b/docs/api/html/settings-ovs-patch.html index 63f5f801..6db3933e 100644 --- a/docs/api/html/settings-ovs-patch.html +++ b/docs/api/html/settings-ovs-patch.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 62. 

+

Table 63. 

diff --git a/docs/api/html/settings-ovs-port.html b/docs/api/html/settings-ovs-port.html index 31626903..4e3280ef 100644 --- a/docs/api/html/settings-ovs-port.html +++ b/docs/api/html/settings-ovs-port.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 63. 

+

Table 64. 

diff --git a/docs/api/html/settings-ppp.html b/docs/api/html/settings-ppp.html index 28d98e08..442c513a 100644 --- a/docs/api/html/settings-ppp.html +++ b/docs/api/html/settings-ppp.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 64. 

+

Table 65. 

diff --git a/docs/api/html/settings-pppoe.html b/docs/api/html/settings-pppoe.html index 83ce5356..4bd15f0d 100644 --- a/docs/api/html/settings-pppoe.html +++ b/docs/api/html/settings-pppoe.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 65. 

+

Table 66. 

diff --git a/docs/api/html/settings-proxy.html b/docs/api/html/settings-proxy.html index 19096693..0a64d155 100644 --- a/docs/api/html/settings-proxy.html +++ b/docs/api/html/settings-proxy.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 66. 

+

Table 67. 

diff --git a/docs/api/html/settings-serial.html b/docs/api/html/settings-serial.html index d869ff71..84830d56 100644 --- a/docs/api/html/settings-serial.html +++ b/docs/api/html/settings-serial.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 67. 

+

Table 68. 

diff --git a/docs/api/html/settings-sriov.html b/docs/api/html/settings-sriov.html index 2c085b25..7019f67e 100644 --- a/docs/api/html/settings-sriov.html +++ b/docs/api/html/settings-sriov.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 68. 

+

Table 69. 

diff --git a/docs/api/html/settings-tc.html b/docs/api/html/settings-tc.html index f5d9cbbc..07ce3754 100644 --- a/docs/api/html/settings-tc.html +++ b/docs/api/html/settings-tc.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 69. 

+

Table 70. 

diff --git a/docs/api/html/settings-team-port.html b/docs/api/html/settings-team-port.html index 3fc62c99..b74520ca 100644 --- a/docs/api/html/settings-team-port.html +++ b/docs/api/html/settings-team-port.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 71. 

+

Table 72. 

diff --git a/docs/api/html/settings-team.html b/docs/api/html/settings-team.html index 4d009974..4a66c6ea 100644 --- a/docs/api/html/settings-team.html +++ b/docs/api/html/settings-team.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 70. 

+

Table 71. 

diff --git a/docs/api/html/settings-tun.html b/docs/api/html/settings-tun.html index efa056f9..307688d0 100644 --- a/docs/api/html/settings-tun.html +++ b/docs/api/html/settings-tun.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 72. 

+

Table 73. 

diff --git a/docs/api/html/settings-user.html b/docs/api/html/settings-user.html index e33c15b6..4c2c5b29 100644 --- a/docs/api/html/settings-user.html +++ b/docs/api/html/settings-user.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 73. 

+

Table 74. 

diff --git a/docs/api/html/settings-vlan.html b/docs/api/html/settings-vlan.html index 28e3da69..4b214be1 100644 --- a/docs/api/html/settings-vlan.html +++ b/docs/api/html/settings-vlan.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 74. 

+

Table 75. 

diff --git a/docs/api/html/settings-vpn.html b/docs/api/html/settings-vpn.html index 216ad2f7..64fc8c86 100644 --- a/docs/api/html/settings-vpn.html +++ b/docs/api/html/settings-vpn.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 75. 

+

Table 76. 

diff --git a/docs/api/html/settings-vrf.html b/docs/api/html/settings-vrf.html index 3ca19d64..49835f63 100644 --- a/docs/api/html/settings-vrf.html +++ b/docs/api/html/settings-vrf.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 76. 

+

Table 77. 

diff --git a/docs/api/html/settings-vxlan.html b/docs/api/html/settings-vxlan.html index e3f7afbe..b160b064 100644 --- a/docs/api/html/settings-vxlan.html +++ b/docs/api/html/settings-vxlan.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 77. 

+

Table 78. 

diff --git a/docs/api/html/settings-wifi-p2p.html b/docs/api/html/settings-wifi-p2p.html index e9d86305..d63a1aca 100644 --- a/docs/api/html/settings-wifi-p2p.html +++ b/docs/api/html/settings-wifi-p2p.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 78. 

+

Table 79. 

diff --git a/docs/api/html/settings-wimax.html b/docs/api/html/settings-wimax.html index 4321e3a1..184337ff 100644 --- a/docs/api/html/settings-wimax.html +++ b/docs/api/html/settings-wimax.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 79. 

+

Table 80. 

diff --git a/docs/api/html/settings-wireguard.html b/docs/api/html/settings-wireguard.html index 58f35e00..0db9b20b 100644 --- a/docs/api/html/settings-wireguard.html +++ b/docs/api/html/settings-wireguard.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 81. 

+

Table 82. 

diff --git a/docs/api/html/settings-wpan.html b/docs/api/html/settings-wpan.html index 0ad76a5e..4df13339 100644 --- a/docs/api/html/settings-wpan.html +++ b/docs/api/html/settings-wpan.html @@ -34,11 +34,11 @@
-

+

Properties

-

Table 84. 

+

Table 85. 

diff --git a/docs/libnm/html/index.html b/docs/libnm/html/index.html index f2bcdd90..c047e326 100644 --- a/docs/libnm/html/index.html +++ b/docs/libnm/html/index.html @@ -15,7 +15,7 @@

- for libnm 1.49.91 + for libnm 1.50.0 The latest version of this documentation can be found on-line at https://networkmanager.dev/docs/libnm/latest/. diff --git a/docs/libnm/html/libnm-nm-version-macros.html b/docs/libnm/html/libnm-nm-version-macros.html index 2530d986..1b484fd4 100644 --- a/docs/libnm/html/libnm-nm-version-macros.html +++ b/docs/libnm/html/libnm-nm-version-macros.html @@ -265,7 +265,7 @@ is compiled against.

NM_MINOR_VERSION

-
#define NM_MINOR_VERSION (49)
+
#define NM_MINOR_VERSION (50)
 

 
Evaluates to the minor version number of NetworkManager which this source
 is compiled against.

@@ -273,7 +273,7 @@ is compiled against.

 

 

 
NM_MICRO_VERSION

-
#define NM_MICRO_VERSION (91)
+
#define NM_MICRO_VERSION (0)
 

 
Evaluates to the micro version number of NetworkManager which this source
 compiled against.

diff --git a/docs/libnm/html/usage.html b/docs/libnm/html/usage.html
index 3dfdb313..a537beeb 100644
--- a/docs/libnm/html/usage.html
+++ b/docs/libnm/html/usage.html
@@ -96,7 +96,7 @@
         

 
$ cc $(pkg-config --libs --cflags libnm) -o hello-nm hello-nm.c
   $ ./hello-nm
-  NetworkManager version: 1.49.91
+  NetworkManager version: 1.50.0
 
   $ 

 

diff --git a/introspection/org.freedesktop.NetworkManager.Device.Hsr.xml b/introspection/org.freedesktop.NetworkManager.Device.Hsr.xml
index 599ddb6f..67e10994 100644
--- a/introspection/org.freedesktop.NetworkManager.Device.Hsr.xml
+++ b/introspection/org.freedesktop.NetworkManager.Device.Hsr.xml
@@ -9,7 +9,7 @@
 
     
@@ -17,7 +17,7 @@
 
     
@@ -25,7 +25,7 @@
 
     
@@ -33,7 +33,7 @@
 
     
@@ -41,7 +41,7 @@
 
     
diff --git a/man/NetworkManager-dispatcher.8 b/man/NetworkManager-dispatcher.8
index 6a0aa3d9..3d3ba776 100644
--- a/man/NetworkManager-dispatcher.8
+++ b/man/NetworkManager-dispatcher.8
@@ -2,9 +2,9 @@
 .\"     Title: NetworkManager-dispatcher
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager-dispatcher 1.49.91
+.\"    Source: NetworkManager-dispatcher 1.50.0
 .\"  Language: English
 .\"
 .TH "NETWORKMANAGER\-DISPATCHER" "8" "" "NetworkManager\-dispatcher 1\&" "Network management daemons"
diff --git a/man/NetworkManager-wait-online.service.8 b/man/NetworkManager-wait-online.service.8
index c025504f..bf50078b 100644
--- a/man/NetworkManager-wait-online.service.8
+++ b/man/NetworkManager-wait-online.service.8
@@ -2,9 +2,9 @@
 .\"     Title: NetworkManager-wait-online.service
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager-wait-online.service 1.49.91
+.\"    Source: NetworkManager-wait-online.service 1.50.0
 .\"  Language: English
 .\"
 .TH "NETWORKMANAGER\-WAIT\-ONLINE\&" "8" "" "NetworkManager\-wait\-online\&" "Network management daemons"
diff --git a/man/NetworkManager.8 b/man/NetworkManager.8
index e1af503e..b0e09a78 100644
--- a/man/NetworkManager.8
+++ b/man/NetworkManager.8
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Network management daemons
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.49\&.91" "Network management daemons"
+.TH "NETWORKMANAGER" "8" "" "NetworkManager 1\&.50\&.0" "Network management daemons"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/NetworkManager.conf.5 b/man/NetworkManager.conf.5
index 04a3542a..681e640e 100644
--- a/man/NetworkManager.conf.5
+++ b/man/NetworkManager.conf.5
@@ -2,12 +2,12 @@
 .\"     Title: NetworkManager.conf
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.49\&.91" "Configuration"
+.TH "NETWORKMANAGER\&.CONF" "5" "" "NetworkManager 1\&.50\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-cloud-setup.8 b/man/nm-cloud-setup.8
index 5d5f4504..a3f1f202 100644
--- a/man/nm-cloud-setup.8
+++ b/man/nm-cloud-setup.8
@@ -2,12 +2,12 @@
 .\"     Title: nm-cloud-setup
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Automatic Network Configuration in Cloud with NetworkManager
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.49\&.91" "Automatic Network Configuratio"
+.TH "NM\-CLOUD\-SETUP" "8" "" "NetworkManager 1\&.50\&.0" "Automatic Network Configuratio"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-initrd-generator.8 b/man/nm-initrd-generator.8
index 21766217..2dfe8e69 100644
--- a/man/nm-initrd-generator.8
+++ b/man/nm-initrd-generator.8
@@ -2,12 +2,12 @@
 .\"     Title: nm-initrd-generator
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: System Administration
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.49\&.91" "System Administration"
+.TH "NM\-INITRD\-GENERATOR" "8" "" "NetworkManager 1\&.50\&.0" "System Administration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-online.1 b/man/nm-online.1
index 6eba87ed..b43ffd69 100644
--- a/man/nm-online.1
+++ b/man/nm-online.1
@@ -2,12 +2,12 @@
 .\"     Title: nm-online
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.49\&.91" "General Commands Manual"
+.TH "NM\-ONLINE" "1" "" "NetworkManager 1\&.50\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-openvswitch.7 b/man/nm-openvswitch.7
index 9ac9c216..294ac00c 100644
--- a/man/nm-openvswitch.7
+++ b/man/nm-openvswitch.7
@@ -2,12 +2,12 @@
 .\"     Title: nm-openvswitch
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Open vSwitch support overview
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.49\&.91" "Open vSwitch support overview"
+.TH "NM\-OPENVSWITCH" "7" "" "NetworkManager 1\&.50\&.0" "Open vSwitch support overview"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-dbus.5 b/man/nm-settings-dbus.5
index 95486f4f..9186c3ca 100644
--- a/man/nm-settings-dbus.5
+++ b/man/nm-settings-dbus.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-dbus
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.49\&.91" "Configuration"
+.TH "NM\-SETTINGS\-DBUS" "5" "" "NetworkManager 1\&.50\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -2056,6 +2056,64 @@ The username used to authenticate with the network, if required\&.  Many provide
 T}
 .TE
 .sp 1
+.SS "hsr setting"
+.PP
+HSR/PRP Settings\&.
+.TS
+allbox tab(:);
+lB lB lB lB.
+T{
+Key Name
+T}:T{
+Value Type
+T}:T{
+Default Value
+T}:T{
+Value Description
+T}
+.T&
+l l l l
+l l l l
+l l l l
+l l l l.
+T{
+multicast\-spec
+T}:T{
+uint32
+T}:T{
+0
+T}:T{
+The last byte of supervision address\&.
+T}
+T{
+port1
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The port1 interface name of the HSR\&. This property is mandatory\&.
+T}
+T{
+port2
+T}:T{
+string
+T}:T{
+\ \&
+T}:T{
+The port2 interface name of the HSR\&. This property is mandatory\&.
+T}
+T{
+prp
+T}:T{
+boolean
+T}:T{
+FALSE
+T}:T{
+The protocol used by the interface, whether it is PRP or HSR\&.
+T}
+.TE
+.sp 1
 .SS "infiniband setting"
 .PP
 Infiniband Settings\&.
@@ -6230,64 +6288,6 @@ Negative values have the special effect of excluding other connections with a gr
 T}
 .TE
 .sp 1
-.SS "hsr setting"
-.PP
-HSR/PRP Settings\&.
-.TS
-allbox tab(:);
-lB lB lB lB.
-T{
-Key Name
-T}:T{
-Value Type
-T}:T{
-Default Value
-T}:T{
-Value Description
-T}
-.T&
-l l l l
-l l l l
-l l l l
-l l l l.
-T{
-multicast\-spec
-T}:T{
-uint32
-T}:T{
-0
-T}:T{
-The last byte of supervision address\&.
-T}
-T{
-port1
-T}:T{
-string
-T}:T{
-\ \&
-T}:T{
-The port1 interface name of the HSR\&. This property is mandatory\&.
-T}
-T{
-port2
-T}:T{
-string
-T}:T{
-\ \&
-T}:T{
-The port2 interface name of the HSR\&. This property is mandatory\&.
-T}
-T{
-prp
-T}:T{
-boolean
-T}:T{
-FALSE
-T}:T{
-The protocol used by the interface, whether it is PRP or HSR\&.
-T}
-.TE
-.sp 1
 .SS "link setting"
 .PP
 Link settings\&.
diff --git a/man/nm-settings-ifcfg-rh.5 b/man/nm-settings-ifcfg-rh.5
index 53d5047b..9df982c2 100644
--- a/man/nm-settings-ifcfg-rh.5
+++ b/man/nm-settings-ifcfg-rh.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-ifcfg-rh
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.49\&.91" "Configuration"
+.TH "NM\-SETTINGS\-IFCFG\-RH" "5" "" "NetworkManager 1\&.50\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-keyfile.5 b/man/nm-settings-keyfile.5
index 2526ba46..95042f17 100644
--- a/man/nm-settings-keyfile.5
+++ b/man/nm-settings-keyfile.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-keyfile
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.49\&.91" "Configuration"
+.TH "NM\-SETTINGS\-KEYFILE" "5" "" "NetworkManager 1\&.50\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nm-settings-nmcli.5 b/man/nm-settings-nmcli.5
index 31494ed9..a64a8fe3 100644
--- a/man/nm-settings-nmcli.5
+++ b/man/nm-settings-nmcli.5
@@ -2,12 +2,12 @@
 .\"     Title: nm-settings-nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Configuration
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.49\&.91" "Configuration"
+.TH "NM\-SETTINGS\-NMCLI" "5" "" "NetworkManager 1\&.50\&.0" "Configuration"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -2261,6 +2261,49 @@ The username used to authenticate with the network, if required\&. Many provider
 .sp
 Format: string
 .RE
+.SS "hsr setting"
+.PP
+HSR/PRP Settings\&.
+.PP
+Properties:
+.PP
+\fBhsr\&.multicast\-spec\fR
+.RS 4
+Alias: multicast\-spec
+.sp
+The last byte of supervision address\&.
+.sp
+Format: integer
+.sp
+Valid values: 0 \- 255
+.RE
+.PP
+\fBhsr\&.port1\fR
+.RS 4
+Alias: port1
+.sp
+The port1 interface name of the HSR\&. This property is mandatory\&.
+.sp
+Format: string
+.RE
+.PP
+\fBhsr\&.port2\fR
+.RS 4
+Alias: port2
+.sp
+The port2 interface name of the HSR\&. This property is mandatory\&.
+.sp
+Format: string
+.RE
+.PP
+\fBhsr\&.prp\fR
+.RS 4
+The protocol used by the interface, whether it is PRP or HSR\&.
+.sp
+Format: boolean
+.sp
+Valid values: true/yes/on, false/no/off
+.RE
 .SS "infiniband setting"
 .PP
 Infiniband Settings\&.
@@ -6307,49 +6350,6 @@ Format: integer
 .sp
 Valid values: \-2147483648 \- 2147483647
 .RE
-.SS "hsr setting"
-.PP
-HSR/PRP Settings\&.
-.PP
-Properties:
-.PP
-\fBhsr\&.multicast\-spec\fR
-.RS 4
-Alias: multicast\-spec
-.sp
-The last byte of supervision address\&.
-.sp
-Format: integer
-.sp
-Valid values: 0 \- 255
-.RE
-.PP
-\fBhsr\&.port1\fR
-.RS 4
-Alias: port1
-.sp
-The port1 interface name of the HSR\&. This property is mandatory\&.
-.sp
-Format: string
-.RE
-.PP
-\fBhsr\&.port2\fR
-.RS 4
-Alias: port2
-.sp
-The port2 interface name of the HSR\&. This property is mandatory\&.
-.sp
-Format: string
-.RE
-.PP
-\fBhsr\&.prp\fR
-.RS 4
-The protocol used by the interface, whether it is PRP or HSR\&.
-.sp
-Format: boolean
-.sp
-Valid values: true/yes/on, false/no/off
-.RE
 .SS "link setting"
 .PP
 Link settings\&.
diff --git a/man/nmcli-examples.7 b/man/nmcli-examples.7
index 94481dc1..bbeacfed 100644
--- a/man/nmcli-examples.7
+++ b/man/nmcli-examples.7
@@ -2,12 +2,12 @@
 .\"     Title: nmcli-examples
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: Examples
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.49\&.91" "Examples"
+.TH "NMCLI\-EXAMPLES" "7" "" "NetworkManager 1\&.50\&.0" "Examples"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmcli.1 b/man/nmcli.1
index b5019e3f..50188e71 100644
--- a/man/nmcli.1
+++ b/man/nmcli.1
@@ -2,12 +2,12 @@
 .\"     Title: nmcli
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NMCLI" "1" "" "NetworkManager 1\&.49\&.91" "General Commands Manual"
+.TH "NMCLI" "1" "" "NetworkManager 1\&.50\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/man/nmtui.1 b/man/nmtui.1
index 67dccf8f..f99bef43 100644
--- a/man/nmtui.1
+++ b/man/nmtui.1
@@ -2,12 +2,12 @@
 .\"     Title: nmtui
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets vsnapshot 
-.\"      Date: 09/16/2024
+.\"      Date: 10/02/2024
 .\"    Manual: General Commands Manual
-.\"    Source: NetworkManager 1.49.91
+.\"    Source: NetworkManager 1.50.0
 .\"  Language: English
 .\"
-.TH "NMTUI" "1" "" "NetworkManager 1\&.49\&.91" "General Commands Manual"
+.TH "NMTUI" "1" "" "NetworkManager 1\&.50\&.0" "General Commands Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
diff --git a/meson.build b/meson.build
index 61298fca..5f28fb52 100644
--- a/meson.build
+++ b/meson.build
@@ -6,7 +6,7 @@ project(
 #  - add corresponding NM_VERSION_x_y_z macros in
 #    "src/libnm-core-public/nm-version-macros.h.in"
 #  - update number in configure.ac
-  version: '1.49.91',
+  version: '1.50.0',
   license: 'GPL2+',
   default_options: [
     'buildtype=debugoptimized',
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index 66eba209..82c2d6b8 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -126,12 +126,18 @@ typedef enum _nm_packed {
     ADDR_METHOD_STATE_FAILED,
 } AddrMethodState;
 
+typedef enum {
+    PORT_STATE_NOT_ATTACHED,
+    PORT_STATE_ATTACHED,
+    PORT_STATE_ATTACHING,
+} PortState;
+
 typedef struct {
     CList         lst_port;
     NMDevice     *port;
     GCancellable *cancellable;
     gulong        watch_id;
-    bool          port_is_attached;
+    PortState     port_state;
     bool          configure;
 } PortInfo;
 
@@ -6693,7 +6699,7 @@ attach_port_done(NMDevice *self, NMDevice *port, gboolean success)
     if (!info)
         return;
 
-    info->port_is_attached = success;
+    info->port_state = (success ? PORT_STATE_ATTACHED : PORT_STATE_NOT_ATTACHED);
 
     nm_device_port_notify_attach_as_port(info->port, success);
 
@@ -6756,7 +6762,7 @@ nm_device_controller_attach_port(NMDevice *self, NMDevice *port, NMConnection *c
     if (!info)
         return;
 
-    if (info->port_is_attached)
+    if (info->port_state == PORT_STATE_ATTACHED)
         success = TRUE;
     else {
         configure = (info->configure && connection != NULL);
@@ -6765,6 +6771,7 @@ nm_device_controller_attach_port(NMDevice *self, NMDevice *port, NMConnection *c
 
         nm_clear_g_cancellable(&info->cancellable);
         info->cancellable = g_cancellable_new();
+        info->port_state  = PORT_STATE_ATTACHING;
         success           = NM_DEVICE_GET_CLASS(self)->attach_port(self,
                                                          port,
                                                          connection,
@@ -6819,6 +6826,7 @@ nm_device_controller_release_port(NMDevice           *self,
     PortInfo                 *info;
     gs_unref_object NMDevice *self_free = NULL;
     gs_unref_object NMDevice *port_free = NULL;
+    const char               *port_state_str;
 
     g_return_if_fail(NM_DEVICE(self));
     g_return_if_fail(NM_DEVICE(port));
@@ -6830,11 +6838,20 @@ nm_device_controller_release_port(NMDevice           *self,
 
     info = find_port_info(self, port);
 
+    if (info->port_state == PORT_STATE_ATTACHED)
+        port_state_str = "(attached)";
+    else if (info->port_state == PORT_STATE_NOT_ATTACHED)
+        port_state_str = "(not attached)";
+    else {
+        nm_assert(info->port_state == PORT_STATE_ATTACHING);
+        port_state_str = "(attaching)";
+    }
+
     _LOGT(LOGD_CORE,
           "controller: release one port " NM_HASH_OBFUSCATE_PTR_FMT "/%s %s%s",
           NM_HASH_OBFUSCATE_PTR(port),
           nm_device_get_iface(port),
-          !info ? "(not registered)" : (info->port_is_attached ? "(attached)" : "(not attached)"),
+          !info ? "(not registered)" : port_state_str,
           release_type == RELEASE_PORT_TYPE_CONFIG_FORCE
               ? " (force-configure)"
               : (release_type == RELEASE_PORT_TYPE_CONFIG ? " (configure)" : "(no-config)"));
@@ -6850,7 +6867,7 @@ nm_device_controller_release_port(NMDevice           *self,
     nm_clear_g_cancellable(&info->cancellable);
 
     /* first, let subclasses handle the release ... */
-    if (info->port_is_attached || nm_device_managed_type_is_external(port)
+    if (info->port_state != PORT_STATE_NOT_ATTACHED || nm_device_managed_type_is_external(port)
         || release_type >= RELEASE_PORT_TYPE_CONFIG_FORCE) {
         NMTernary ret;
 
diff --git a/src/libnm-client-impl/nm-device-hsr.c b/src/libnm-client-impl/nm-device-hsr.c
index 7160bf6d..fd4da41b 100644
--- a/src/libnm-client-impl/nm-device-hsr.c
+++ b/src/libnm-client-impl/nm-device-hsr.c
@@ -20,10 +20,15 @@ NM_GOBJECT_PROPERTIES_DEFINE_BASE(PROP_PORT1,
                                   PROP_MULTICAST_SPEC,
                                   PROP_PRP, );
 
+enum {
+    PROPERTY_O_IDX_PORT1,
+    PROPERTY_O_IDX_PORT2,
+    _PROPERTY_O_IDX_NUM,
+};
+
 typedef struct {
     char            *supervision_address;
-    NMLDBusPropertyO port1;
-    NMLDBusPropertyO port2;
+    NMLDBusPropertyO property_o[_PROPERTY_O_IDX_NUM];
     guint8           multicast_spec;
     bool             prp;
 } NMDeviceHsrPrivate;
@@ -57,7 +62,8 @@ nm_device_hsr_get_port1(NMDeviceHsr *device)
 {
     g_return_val_if_fail(NM_IS_DEVICE_HSR(device), NULL);
 
-    return nml_dbus_property_o_get_obj(&NM_DEVICE_HSR_GET_PRIVATE(device)->port1);
+    return nml_dbus_property_o_get_obj(
+        &NM_DEVICE_HSR_GET_PRIVATE(device)->property_o[PROPERTY_O_IDX_PORT1]);
 }
 
 /**
@@ -73,7 +79,8 @@ nm_device_hsr_get_port2(NMDeviceHsr *device)
 {
     g_return_val_if_fail(NM_IS_DEVICE_HSR(device), NULL);
 
-    return nml_dbus_property_o_get_obj(&NM_DEVICE_HSR_GET_PRIVATE(device)->port2);
+    return nml_dbus_property_o_get_obj(
+        &NM_DEVICE_HSR_GET_PRIVATE(device)->property_o[PROPERTY_O_IDX_PORT2]);
 }
 
 /**
@@ -179,12 +186,12 @@ const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_hsr = NML_DBUS_META_IFACE_
         NML_DBUS_META_PROPERTY_INIT_O_PROP("Port1",
                                            PROP_PORT1,
                                            NMDeviceHsr,
-                                           _priv.port1,
+                                           _priv.property_o[PROPERTY_O_IDX_PORT1],
                                            nm_device_get_type),
         NML_DBUS_META_PROPERTY_INIT_O_PROP("Port2",
                                            PROP_PORT2,
                                            NMDeviceHsr,
-                                           _priv.port2,
+                                           _priv.property_o[PROPERTY_O_IDX_PORT2],
                                            nm_device_get_type),
         NML_DBUS_META_PROPERTY_INIT_B("Prp", PROP_PRP, NMDeviceHsr, _priv.prp),
         NML_DBUS_META_PROPERTY_INIT_S("SupervisionAddress",
@@ -203,8 +210,7 @@ nm_device_hsr_class_init(NMDeviceHsrClass *klass)
 
     _NM_OBJECT_CLASS_INIT_PRIV_PTR_DIRECT(nm_object_class, NMDeviceHsr);
 
-    _NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_1(nm_object_class, NMDeviceHsrPrivate, port1);
-    _NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_1(nm_object_class, NMDeviceHsrPrivate, port2);
+    _NM_OBJECT_CLASS_INIT_PROPERTY_O_FIELDS_N(nm_object_class, NMDeviceHsrPrivate, property_o);
 
     /**
      * NMDeviceHsr:port1:
diff --git a/src/libnm-client-impl/nm-libnm-utils.c b/src/libnm-client-impl/nm-libnm-utils.c
index 9ebca216..8af234ce 100644
--- a/src/libnm-client-impl/nm-libnm-utils.c
+++ b/src/libnm-client-impl/nm-libnm-utils.c
@@ -782,6 +782,7 @@ const NMLDBusMetaIface *const _nml_dbus_meta_ifaces[] = {
     &_nml_dbus_meta_iface_nm_device_bridge,
     &_nml_dbus_meta_iface_nm_device_dummy,
     &_nml_dbus_meta_iface_nm_device_generic,
+    &_nml_dbus_meta_iface_nm_device_hsr,
     &_nml_dbus_meta_iface_nm_device_iptunnel,
     &_nml_dbus_meta_iface_nm_device_infiniband,
     &_nml_dbus_meta_iface_nm_device_loopback,
diff --git a/src/libnm-client-impl/nm-libnm-utils.h b/src/libnm-client-impl/nm-libnm-utils.h
index fddda077..61ff442d 100644
--- a/src/libnm-client-impl/nm-libnm-utils.h
+++ b/src/libnm-client-impl/nm-libnm-utils.h
@@ -579,7 +579,7 @@ struct _NMLDBusMetaIface {
                              NML_DBUS_META_IFACE_OBJ_PROPERTIES(),                              \
                              ##__VA_ARGS__)
 
-extern const NMLDBusMetaIface *const _nml_dbus_meta_ifaces[45];
+extern const NMLDBusMetaIface *const _nml_dbus_meta_ifaces[46];
 
 extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm;
 extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_accesspoint;
@@ -593,6 +593,7 @@ extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_bond;
 extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_bridge;
 extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_dummy;
 extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_generic;
+extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_hsr;
 extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_infiniband;
 extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_iptunnel;
 extern const NMLDBusMetaIface _nml_dbus_meta_iface_nm_device_loopback;
diff --git a/src/libnm-client-impl/tests/test-libnm.c b/src/libnm-client-impl/tests/test-libnm.c
index f677ad8e..f6bf1567 100644
--- a/src/libnm-client-impl/tests/test-libnm.c
+++ b/src/libnm-client-impl/tests/test-libnm.c
@@ -2690,6 +2690,7 @@ test_types(void)
         G(nm_device_ethernet_get_type),
         G(nm_device_generic_get_type),
         G(nm_device_get_type),
+        G(nm_device_hsr_get_type),
         G(nm_device_infiniband_get_type),
         G(nm_device_ip_tunnel_get_type),
         G(nm_device_macsec_get_type),
@@ -2762,6 +2763,7 @@ test_types(void)
         G(nm_setting_generic_get_type),
         G(nm_setting_get_type),
         G(nm_setting_gsm_get_type),
+        G(nm_setting_hsr_get_type),
         G(nm_setting_infiniband_get_type),
         G(nm_setting_ip4_config_get_type),
         G(nm_setting_ip6_config_addr_gen_mode_get_type),
@@ -3383,6 +3385,11 @@ test_dbus_meta_types(void)
             NM_TYPE_DEVICE_GENERIC,
             NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
         },
+        {
+            NM_DBUS_INTERFACE_DEVICE_HSR,
+            NM_TYPE_DEVICE_HSR,
+            NML_DBUS_META_INTERFACE_PRIO_INSTANTIATE_30,
+        },
         {
             NM_DBUS_INTERFACE_DEVICE_INFINIBAND,
             NM_TYPE_DEVICE_INFINIBAND,
diff --git a/src/libnm-core-impl/nm-setting-connection.c b/src/libnm-core-impl/nm-setting-connection.c
index b51cd46b..3298dce6 100644
--- a/src/libnm-core-impl/nm-setting-connection.c
+++ b/src/libnm-core-impl/nm-setting-connection.c
@@ -1379,13 +1379,13 @@ verify(NMSetting *setting, NMConnection *connection, GError **error)
                 if (connection)
                     goto after_interface_name;
                 iface_type = NMU_IFACE_ANY;
-            } else if (NM_IN_STRSET(ovs_iface_type, "patch")) {
+            } else if (NM_IN_STRSET(ovs_iface_type, "patch", "dpdk")) {
                 /* this interface type is internal to OVS. */
                 iface_type = NMU_IFACE_OVS;
             } else {
                 /* This interface type also requires a netdev. We need to validate
                  * for both OVS and KERNEL. */
-                nm_assert(NM_IN_STRSET(ovs_iface_type, "internal", "system", "dpdk"));
+                nm_assert(NM_IN_STRSET(ovs_iface_type, "internal", "system"));
                 iface_type = NMU_IFACE_OVS_AND_KERNEL;
             }
         } else
diff --git a/src/libnm-core-impl/tests/test-general.c b/src/libnm-core-impl/tests/test-general.c
index 0a39010c..8d4ea069 100644
--- a/src/libnm-core-impl/tests/test-general.c
+++ b/src/libnm-core-impl/tests/test-general.c
@@ -10832,7 +10832,7 @@ test_connection_ovs_ifname(gconstpointer test_data)
     /* good if bridge, port, or patch interface */
     g_object_set(s_con, NM_SETTING_CONNECTION_INTERFACE_NAME, "ovs123123123123130123123", NULL);
 
-    if (!ovs_iface_type || nm_streq(ovs_iface_type, "patch"))
+    if (!ovs_iface_type || NM_IN_STRSET(ovs_iface_type, "patch", "dpdk"))
         nmtst_assert_connection_verifies(con);
     else {
         nmtst_assert_connection_unnormalizable(con,
diff --git a/src/libnmc-setting/settings-docs.h.in b/src/libnmc-setting/settings-docs.h.in
index 091dcd64..731f32a7 100644
--- a/src/libnmc-setting/settings-docs.h.in
+++ b/src/libnmc-setting/settings-docs.h.in
@@ -159,6 +159,10 @@
 #define DESCRIBE_DOC_NM_SETTING_GSM_SIM_ID N_("The SIM card unique identifier (as given by the WWAN management service) which this connection applies to.  If given, the connection will apply to any device also allowed by \"device-id\" which contains a SIM card matching the given identifier.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_SIM_OPERATOR_ID N_("A MCC/MNC string like \"310260\" or \"21601\" identifying the specific mobile network operator which this connection applies to.  If given, the connection will apply to any device also allowed by \"device-id\" and \"sim-id\" which contains a SIM card provisioned by the given operator.")
 #define DESCRIBE_DOC_NM_SETTING_GSM_USERNAME N_("The username used to authenticate with the network, if required.  Many providers do not require a username, or accept any username.  But if a username is required, it is specified here.")
+#define DESCRIBE_DOC_NM_SETTING_HSR_MULTICAST_SPEC N_("The last byte of supervision address.")
+#define DESCRIBE_DOC_NM_SETTING_HSR_PORT1 N_("The port1 interface name of the HSR. This property is mandatory.")
+#define DESCRIBE_DOC_NM_SETTING_HSR_PORT2 N_("The port2 interface name of the HSR. This property is mandatory.")
+#define DESCRIBE_DOC_NM_SETTING_HSR_PRP N_("The protocol used by the interface, whether it is PRP or HSR.")
 #define DESCRIBE_DOC_NM_SETTING_INFINIBAND_MAC_ADDRESS N_("If specified, this connection will only apply to the IPoIB device whose permanent MAC address matches. This property does not change the MAC address of the device (i.e. MAC spoofing).")
 #define DESCRIBE_DOC_NM_SETTING_INFINIBAND_MTU N_("If non-zero, only transmit packets of the specified size or smaller, breaking larger packets up into multiple frames.")
 #define DESCRIBE_DOC_NM_SETTING_INFINIBAND_P_KEY N_("The InfiniBand p-key to use for this device. A value of -1 means to use the default p-key (aka \"the p-key at index 0\"). Otherwise, it is a 16-bit unsigned integer, whose high bit 0x8000 is set if it is a \"full membership\" p-key. The values 0 and 0x8000 are not allowed. With the p-key set, the interface name is always \"$parent.$p_key\". Setting \"connection.interface-name\" to another name is not supported. Note that kernel will internally always set the full membership bit, although the interface name does not reflect that. Usually the user would want to configure a full membership p-key with 0x8000 flag set.")
@@ -464,10 +468,6 @@
 #define DESCRIBE_DOC_NM_SETTING_HOSTNAME_FROM_DNS_LOOKUP N_("Whether the system hostname can be determined from reverse DNS lookup of addresses on this device. When set to \"default\" (-1), the value from global configuration is used. If the property doesn't have a value in the global configuration, NetworkManager assumes the value to be \"true\" (1).")
 #define DESCRIBE_DOC_NM_SETTING_HOSTNAME_ONLY_FROM_DEFAULT N_("If set to \"true\" (1), NetworkManager attempts to get the hostname via DHCPv4/DHCPv6 or reverse DNS lookup on this device only when the device has the default route for the given address family (IPv4/IPv6). If set to \"false\" (0), the hostname can be set from this device even if it doesn't have the default route. When set to \"default\" (-1), the value from global configuration is used. If the property doesn't have a value in the global configuration, NetworkManager assumes the value to be \"false\" (0).")
 #define DESCRIBE_DOC_NM_SETTING_HOSTNAME_PRIORITY N_("The relative priority of this connection to determine the system hostname. A lower numerical value is better (higher priority).  A connection with higher priority is considered before connections with lower priority. If the value is zero, it can be overridden by a global value from NetworkManager configuration. If the property doesn't have a value in the global configuration, the value is assumed to be 100. Negative values have the special effect of excluding other connections with a greater numerical priority value; so in presence of at least one negative priority, only connections with the lowest priority value will be used to determine the hostname.")
-#define DESCRIBE_DOC_NM_SETTING_HSR_MULTICAST_SPEC N_("The last byte of supervision address.")
-#define DESCRIBE_DOC_NM_SETTING_HSR_PORT1 N_("The port1 interface name of the HSR. This property is mandatory.")
-#define DESCRIBE_DOC_NM_SETTING_HSR_PORT2 N_("The port2 interface name of the HSR. This property is mandatory.")
-#define DESCRIBE_DOC_NM_SETTING_HSR_PRP N_("The protocol used by the interface, whether it is PRP or HSR.")
 #define DESCRIBE_DOC_NM_SETTING_LINK_GRO_MAX_SIZE N_("The maximum size of a packet built by the Generic Receive Offload stack for this device. The value must be between 0 and 4294967295. When set to -1, the existing value is preserved.")
 #define DESCRIBE_DOC_NM_SETTING_LINK_GSO_MAX_SEGMENTS N_("The maximum segments of a Generic Segment Offload packet the device should accept. The value must be between 0 and 4294967295. When set to -1, the existing value is preserved.")
 #define DESCRIBE_DOC_NM_SETTING_LINK_GSO_MAX_SIZE N_("The maximum size of a Generic Segment Offload packet the device should accept. The value must be between 0 and 4294967295. When set to -1, the existing value is preserved.")
diff --git a/tools/generate-docs-nm-settings-docs-merge.py b/tools/generate-docs-nm-settings-docs-merge.py
index 3ad8755d..853fb773 100755
--- a/tools/generate-docs-nm-settings-docs-merge.py
+++ b/tools/generate-docs-nm-settings-docs-merge.py
@@ -36,6 +36,7 @@ _setting_name_order = [
     "ethtool",
     "generic",
     "gsm",
+    "hsr",
     "infiniband",
     "ipv4",
     "ipv6",
-- 
cgit 1.3.0-6-gf8a5