New upstream version 1.12.0 upstream/1.12.0

1 files changed, 28 insertions, 6 deletions

diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index b03efc33..3105f514 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -187,6 +187,7 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <title>Connection and Setting API Reference</title>
     <xi:include href="xml/nm-connection.xml"/>
     <xi:include href="xml/nm-simple-connection.xml"/>
+    <xi:include href="xml/nm-remote-connection.xml"/>
     <xi:include href="xml/nm-setting.xml"/>
     <xi:include href="xml/nm-setting-connection.xml"/>
     <!-- begin alphabetical -->
@@ -194,8 +195,8 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-setting-adsl.xml"/>
     <xi:include href="xml/nm-setting-bluetooth.xml"/>
     <xi:include href="xml/nm-setting-bond.xml"/>
-    <xi:include href="xml/nm-setting-bridge.xml"/>
     <xi:include href="xml/nm-setting-bridge-port.xml"/>
+    <xi:include href="xml/nm-setting-bridge.xml"/>
     <xi:include href="xml/nm-setting-cdma.xml"/>
     <xi:include href="xml/nm-setting-dcb.xml"/>
     <xi:include href="xml/nm-setting-dummy.xml"/>
@@ -209,19 +210,26 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-setting-macsec.xml"/>
     <xi:include href="xml/nm-setting-macvlan.xml"/>
     <xi:include href="xml/nm-setting-olpc-mesh.xml"/>
-    <xi:include href="xml/nm-setting-ppp.xml"/>
+    <xi:include href="xml/nm-setting-ovs-bridge.xml"/>
+    <xi:include href="xml/nm-setting-ovs-interface.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-pppoe.xml"/>
+    <xi:include href="xml/nm-setting-ppp.xml"/>
+    <xi:include href="xml/nm-setting-proxy.xml"/>
     <xi:include href="xml/nm-setting-serial.xml"/>
-    <xi:include href="xml/nm-setting-team.xml"/>
+    <xi:include href="xml/nm-setting-tc-config.xml"/>
     <xi:include href="xml/nm-setting-team-port.xml"/>
+    <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-vlan.xml"/>
     <xi:include href="xml/nm-setting-vpn.xml"/>
     <xi:include href="xml/nm-setting-vxlan.xml"/>
     <xi:include href="xml/nm-setting-wimax.xml"/>
     <xi:include href="xml/nm-setting-wired.xml"/>
-    <xi:include href="xml/nm-setting-wireless.xml"/>
     <xi:include href="xml/nm-setting-wireless-security.xml"/>
+    <xi:include href="xml/nm-setting-wireless.xml"/>
     <!-- end alphabetical -->
   </chapter>
 
@@ -242,6 +250,10 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <xi:include href="xml/nm-device-macvlan.xml"/>
     <xi:include href="xml/nm-device-modem.xml"/>
     <xi:include href="xml/nm-device-olpc-mesh.xml"/>
+    <xi:include href="xml/nm-device-ovs-bridge.xml"/>
+    <xi:include href="xml/nm-device-ovs-interface.xml"/>
+    <xi:include href="xml/nm-device-ovs-port.xml"/>
+    <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-vlan.xml"/>
@@ -251,11 +263,11 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
     <!-- end alphabetical -->
     <xi:include href="xml/nm-active-connection.xml"/>
     <xi:include href="xml/nm-vpn-connection.xml"/>
-    <xi:include href="xml/nm-remote-connection.xml"/>
     <xi:include href="xml/nm-access-point.xml"/>
     <xi:include href="xml/nm-wimax-nsp.xml"/>
     <xi:include href="xml/nm-ip-config.xml"/>
     <xi:include href="xml/nm-dhcp-config.xml"/>
+    <xi:include href="xml/nm-checkpoint.xml"/>
   </chapter>
 
   <chapter>
@@ -266,10 +278,20 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
 
   <chapter>
     <title>VPN Plugin API Reference</title>
-    <xi:include href="xml/nm-vpn-dbus-interface.xml"/>
+    <xi:include href="xml/nm-vpn-service-plugin.xml"/>
+    <xi:include href="xml/nm-vpn-plugin-info.xml"/>
+    <xi:include href="xml/nm-vpn-editor.xml"/>
     <xi:include href="xml/nm-vpn-editor-plugin.xml"/>
+    <xi:include href="xml/nm-vpn-plugin-old.xml"/>
   </chapter>
 
+  <!--
+    These don't contain any useful documentaiton. Keep them here,
+    so that tools/check-docs.sh knows that we did omit them intentionally.
+    <xi:include href="xml/nm-core-enum-types.xml"/>
+    <xi:include href="xml/nm-enum-types.xml"/>
+  -->
+
   <chapter id="object-tree">
     <title>Object Hierarchy</title>
      <xi:include href="xml/tree_index.sgml"/>