diff options
| author | Michael Biebl <biebl@debian.org> | 2018-10-21 03:00:34 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-10-21 03:00:34 +0200 |
| commit | 1f85f9683a41ca116af20fd19940576040303080 (patch) | |
| tree | 54c4ac337fe0b0091772b7ef6a22c715dd985fab /docs/api/network-manager-docs.xml | |
| parent | eca0cfe89a2a7ec88abe9c03075160f46b338137 (diff) | |
| parent | 5554398639fa9e344bd12205a64874e6436b936e (diff) | |
Merge branch 'experimental'
Diffstat (limited to 'docs/api/network-manager-docs.xml')
| -rw-r--r-- | docs/api/network-manager-docs.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index 625c3d57..5679f4b4 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -19,6 +19,7 @@ <year>2015</year> <year>2016</year> <year>2017</year> + <year>2018</year> <holder>The NetworkManager Authors</holder> </copyright> @@ -76,7 +77,8 @@ <xi:include href="../../man/nm-settings-keyfile.xml"><xi:fallback /></xi:include> <xi:include href="../../man/nm-settings-ifcfg-rh.xml"><xi:fallback /></xi:include> <xi:include href="../../man/nm-online.xml"/> - <xi:include href="../../man/nm-openvswitch.xml"/> + <xi:include href="../../man/nm-initrd-generator.xml"/> + <xi:include href="../../man/nm-openvswitch.xml"><xi:fallback /></xi:include> </part> <part id="ref-settings"> @@ -188,6 +190,7 @@ <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Generic.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Infiniband.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.IPTunnel.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Lowpan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macsec.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Modem.xml"/> @@ -201,7 +204,9 @@ <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Veth.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vlan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Vxlan.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.WireGuard.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wireless.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wpan.xml"/> <xi:include href="dbus-org.freedesktop.NetworkManager.PPP.xml"/> </chapter> |