about summary refs log tree commit diff
path: root/docs/api/html/NetworkManager.devhelp2
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2021-02-25 11:36:45 +0100
committerSebastien Bacher <seb128@ubuntu.com>2021-02-25 11:36:45 +0100
commitd92aa7f298fe84d4cf686c5ad64b73438e00d377 (patch)
tree2f1f4c7b48cff9e63b0d0e3669bada3d9aeda72e /docs/api/html/NetworkManager.devhelp2
parenta82e048a943092315a32d745c99e0f5635e29134 (diff)
parent3a56bce6c0ea7ba0fe269520547740783b342e0d (diff)
Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream/latest
Diffstat (limited to 'docs/api/html/NetworkManager.devhelp2')
-rw-r--r--docs/api/html/NetworkManager.devhelp25
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/api/html/NetworkManager.devhelp2 b/docs/api/html/NetworkManager.devhelp2
index c2c30fb7..6c7e5d6c 100644
--- a/docs/api/html/NetworkManager.devhelp2
+++ b/docs/api/html/NetworkManager.devhelp2
@@ -13,6 +13,7 @@
       <sub name="nm-settings-ifcfg-rh" link="nm-settings-ifcfg-rh.html"/>
       <sub name="nm-online" link="nm-online.html"/>
       <sub name="nm-initrd-generator" link="nm-initrd-generator.html"/>
+      <sub name="nm-cloud-setup" link="nm-cloud-setup.html"/>
       <sub name="nm-openvswitch" link="nm-openvswitch.html"/>
     </sub>
     <sub name="Network Configuration Setting Specification" link="ref-settings.html">
@@ -65,6 +66,9 @@
         <sub name="" link="settings-802-11-wireless.html"/>
         <sub name="" link="settings-802-11-wireless-security.html"/>
         <sub name="" link="settings-wpan.html"/>
+        <sub name="" link="settings-hostname.html"/>
+        <sub name="" link="settings-ovs-external-ids.html"/>
+        <sub name="" link="settings-veth.html"/>
       </sub>
       <sub name="Secret flag types" link="secrets-flags.html"/>
     </sub>
@@ -649,6 +653,7 @@
     <keyword type="constant" name="NM_802_11_AP_SEC_KEY_MGMT_SAE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.10.4.2.1.4.12.1.1id-1.4.17.2.10.4.2.1.4.12.1.2"/>
     <keyword type="constant" name="NM_802_11_AP_SEC_KEY_MGMT_OWE" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.10.4.2.1.4.13.1.1id-1.4.17.2.10.4.2.1.4.13.1.2"/>
     <keyword type="constant" name="NM_802_11_AP_SEC_KEY_MGMT_OWE_TM" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.10.4.2.1.4.14.1.1id-1.4.17.2.10.4.2.1.4.14.1.2"/>
+    <keyword type="constant" name="NM_802_11_AP_SEC_KEY_MGMT_EAP_SUITE_B_192" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.10.4.2.1.4.15.1.1id-1.4.17.2.10.4.2.1.4.15.1.2"/>
     <keyword type="constant" name="NM_802_11_MODE_UNKNOWN" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.11.4.2.1.4.1.1.1id-1.4.17.2.11.4.2.1.4.1.1.2"/>
     <keyword type="constant" name="NM_802_11_MODE_ADHOC" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.11.4.2.1.4.2.1.1id-1.4.17.2.11.4.2.1.4.2.1.2"/>
     <keyword type="constant" name="NM_802_11_MODE_INFRA" link="nm-dbus-types.htmlnm-dbus-types.html#id-1.4.17.2.11.4.2.1.4.3.1.1id-1.4.17.2.11.4.2.1.4.3.1.2"/>