Merge tag 'debian/1.40.8-1' into debian/bullseye-backports

network-manager Debian release 1.40.8-1

5 files changed, 7 insertions, 7 deletions

diff --git a/docs/api/html/index.html b/docs/api/html/index.html
index ad46bacb..6c1324c1 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.40.6
+      for NetworkManager 1.40.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 d940c0f8..0580b439 100644
--- a/docs/api/html/nm-dbus-types.html
+++ b/docs/api/html/nm-dbus-types.html
@@ -3071,7 +3071,7 @@
 <hr>
 <div class="refsect2">
 <a name="NMMetered"></a><h3>enum NMMetered</h3>
-<p>The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the <a href="/usr/share/gtk-doc/html/libnm/NMDevice.html#NMDevice-struct">NMDevice</a> at a given moment.</p>
+<p>The NMMetered enum has two different purposes: one is to configure "connection.metered" setting of a connection profile in NMSettingConnection, and the other is to express the actual metered state of the NMDevice at a given moment.</p>
 <p>For the connection profile only NM_METERED_UNKNOWN, NM_METERED_NO and NM_METERED_YES are allowed.</p>
 <p>The device's metered state at runtime is determined by the profile which is currently active. If the profile explicitly specifies NM_METERED_NO or NM_METERED_YES, then the device's metered state is as such. If the connection profile leaves it undecided at NM_METERED_UNKNOWN (the default), then NetworkManager tries to guess the metered state, for example based on the device type or on DHCP options (like Android devices exposing a "ANDROID_METERED" DHCP vendor option). This then leads to either NM_METERED_GUESS_NO or NM_METERED_GUESS_YES.</p>
 <p>Most applications probably should treat the runtime state NM_METERED_GUESS_YES like NM_METERED_YES, and all other states as not metered.</p>
diff --git a/docs/api/html/nm-settings-dbus.html b/docs/api/html/nm-settings-dbus.html
index 854ca8f0..fd1f0892 100644
--- a/docs/api/html/nm-settings-dbus.html
+++ b/docs/api/html/nm-settings-dbus.html
@@ -2372,7 +2372,7 @@
 <a name="nm-settings-dbus.property.macsec.mka-cak"></a>mka-cak</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</td>
+<td> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</td>
 </tr>
 <tr>
 <td align="left">
@@ -2386,7 +2386,7 @@
 <a name="nm-settings-dbus.property.macsec.mka-ckn"></a>mka-ckn</td>
 <td align="left">string</td>
 <td align="left"> </td>
-<td> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</td>
+<td> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</td>
 </tr>
 <tr>
 <td align="left">
diff --git a/docs/api/html/nm-settings-nmcli.html b/docs/api/html/nm-settings-nmcli.html
index 17ef394f..e2f76d6a 100644
--- a/docs/api/html/nm-settings-nmcli.html
+++ b/docs/api/html/nm-settings-nmcli.html
@@ -2787,7 +2787,7 @@ Example: <code class="literal">priority 5 from 1:2:3::5/128 table 45</code>
 <td>
 <p>
             Alias: cak</p>
-<p> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement.</p>
+<p> The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement. Must be a string of 32 hexadecimal characters.</p>
 <p>
             Format: string</p>
 </td>
@@ -2805,7 +2805,7 @@ Example: <code class="literal">priority 5 from 1:2:3::5/128 table 45</code>
 <td>
 <p>
             Alias: ckn</p>
-<p> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement.</p>
+<p> The pre-shared CKN (Connectivity-association Key Name) for MACsec Key Agreement. Must be a string of hexadecimal characters with a even length between 2 and 64.</p>
 <p>
             Format: string</p>
 </td>
diff --git a/docs/api/version.xml b/docs/api/version.xml
index 4adfc24b..19d25d0a 100644
--- a/docs/api/version.xml
+++ b/docs/api/version.xml
@@ -1 +1 @@
-1.40.6
+1.40.8