diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2019-01-25 10:49:37 +0100 |
| commit | 404ebe62622150e77e311777dff8617eb974e834 (patch) | |
| tree | cc7f73d3e435d5b3ee85e2bef833e8de1fb133e3 /docs/api/network-manager-docs.xml | |
| parent | 227c401a10a930af6fd5f123aef345fcd130d6aa (diff) | |
| parent | 3626b425d1bc017fdc6f1ea0cfd329d1e1681641 (diff) | |
Merge remote-tracking branch 'salsa/upstream' into upstream
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> |