diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:35:01 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2021-02-25 11:49:48 +0100 |
| commit | 77dea84aa6e816f66dc622cec8ae2668eba3c068 (patch) | |
| tree | 755536a0ed1fb36c2899e9bff9e092c4008a25c4 /docs/libnm/libnm-docs.xml | |
| parent | 47f08826b44eed651b44dc8bacb5b46bc4c52067 (diff) | |
| parent | fd80297a396cc4dd7da4da20208fb360aa369aa7 (diff) | |
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'docs/libnm/libnm-docs.xml')
| -rw-r--r-- | docs/libnm/libnm-docs.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml index 47b1fa1c..5e554c2b 100644 --- a/docs/libnm/libnm-docs.xml +++ b/docs/libnm/libnm-docs.xml @@ -324,6 +324,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in <xi:include href="xml/nm-setting-ethtool.xml"/> <xi:include href="xml/nm-setting-generic.xml"/> <xi:include href="xml/nm-setting-gsm.xml"/> + <xi:include href="xml/nm-setting-hostname.xml"/> <xi:include href="xml/nm-setting-infiniband.xml"/> <xi:include href="xml/nm-setting-ip4-config.xml"/> <xi:include href="xml/nm-setting-ip6-config.xml"/> @@ -338,6 +339,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in <xi:include href="xml/nm-setting-ovs-dpdk.xml"/> <xi:include href="xml/nm-setting-ovs-patch.xml"/> <xi:include href="xml/nm-setting-ovs-port.xml"/> + <xi:include href="xml/nm-setting-ovs-external-ids.xml"/> <xi:include href="xml/nm-setting-ppp.xml"/> <xi:include href="xml/nm-setting-pppoe.xml"/> <xi:include href="xml/nm-setting-proxy.xml"/> @@ -348,6 +350,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in <xi:include href="xml/nm-setting-team.xml"/> <xi:include href="xml/nm-setting-tun.xml"/> <xi:include href="xml/nm-setting-user.xml"/> + <xi:include href="xml/nm-setting-veth.xml"/> <xi:include href="xml/nm-setting-vlan.xml"/> <xi:include href="xml/nm-setting-vpn.xml"/> <xi:include href="xml/nm-setting-vrf.xml"/> @@ -386,6 +389,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in <xi:include href="xml/nm-device-ppp.xml"/> <xi:include href="xml/nm-device-team.xml"/> <xi:include href="xml/nm-device-tun.xml"/> + <xi:include href="xml/nm-device-veth.xml"/> <xi:include href="xml/nm-device-vlan.xml"/> <xi:include href="xml/nm-device-vrf.xml"/> <xi:include href="xml/nm-device-vxlan.xml"/> @@ -407,6 +411,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in <chapter> <title>Utility API Reference</title> + <xi:include href="xml/nm-keyfile.xml"/> <xi:include href="xml/nm-utils.xml"/> <xi:include href="xml/nm-version.xml"/> </chapter> |