From e152ec7bf4ba252ff9d3eb13eabd417b931dac9a Mon Sep 17 00:00:00 2001
From: Iain Lane <iain@orangesquash.org.uk>
Date: Mon, 24 Sep 2018 09:29:55 +0100
Subject: Import Upstream version 1.12.2

---
 docs/api/network-manager-docs.xml | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

(limited to 'docs/api/network-manager-docs.xml')

diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index 0002f8ee..625c3d57 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -192,13 +192,16 @@
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Macvlan.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Modem.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.OlpcMesh.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.OvsBridge.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.OvsInterface.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.OvsPort.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Ppp.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Team.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Tun.xml"/>
       <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.Wireless.xml"/>
-      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.WiMax.xml"/>
       <xi:include href="dbus-org.freedesktop.NetworkManager.PPP.xml"/>
     </chapter>
 
@@ -239,10 +242,25 @@
       <xi:include href="dbus-org.freedesktop.NetworkManager.AccessPoint.xml"/>
     </chapter>
 
+    <chapter id="ref-dbus-checkpoint">
+      <title>The <literal>/org/freedesktop/NetworkManager/Checkpoint/*</literal> objects</title>
+      <!-- TODO: Describe the objects here -->
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Checkpoint.xml"/>
+    </chapter>
+
     <chapter id="dbus-types">
       <title>Types</title>
       <xi:include href="../../libnm-core/nm-dbus-types.xml"/>
     </chapter>
+
+    <!--
+      These are obsolete and intentionally ommitted from the manual since they can't
+      appear on the D-Bus API of the present version of NetworkManager.
+      Keep them here so that "make check" won't think that they were skipped accidentally .
+      <xi:include href="dbus-org.freedesktop.NetworkManager.Device.WiMax.xml"/>
+      <xi:include href="dbus-org.freedesktop.NetworkManager.WiMax.Nsp.xml"/>
+    -->
+
   </part>
 
   <part id="secret-agents">
@@ -258,7 +276,7 @@
   <part id="vpn-plugins">
     <title>VPN Plugin D-Bus API Reference</title>
 
-    <chapter id="dbus-vpn-types">
+    <chapter id="dbus-vpn-plugin">
       <title>VPN services</title>
       <!-- TODO: Describe the VPN services here -->
       <xi:include href="dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml"/>
-- 
cgit 1.3.0-6-gf8a5