diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-10 18:24:07 +0100 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-17 10:15:11 +0100 |
commit | 967207f5bc2c7a73ba87345a52ef9333388a74c0 (patch) | |
tree | 645c11fe5b39c42c85ed98c0311a6b05b44f3972 | |
parent | c673c5210143316234cb415ce0380aea9f63551e (diff) | |
download | NetworkManager-967207f5bc2c7a73ba87345a52ef9333388a74c0.tar.gz |
docs/api: move D-Bus reference after nm-settings
-rw-r--r-- | docs/api/network-manager-docs.xml | 114 |
1 files changed, 57 insertions, 57 deletions
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index c8f8bc5c85..0ca12d5f4e 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -78,63 +78,6 @@ <xi:include href="../../man/nm-online.xml"/> </chapter> - <chapter id="spec"> - <title>D-Bus API Reference</title> - - <para> - This part documents the D-Bus interface used to access the - NetworkManager daemon. - </para> - - <section id="dbus-interfaces"> - <title>Interfaces</title> - <!-- TODO: Split me into chapters about daemon, vpn plugins, dispatcher and the secret agent. - Then describe the daemon's singletons and object hierarchy. --> - <xi:include href="dbus-org.freedesktop.NetworkManager.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Settings.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.AgentManager.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.AccessPoint.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.PPP.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Settings.Connection.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.VPN.Connection.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Connection.Active.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Device.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Adsl.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bond.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bridge.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Dummy.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wired.xml"/> - <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.Macsec.xml"/> - <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.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.DHCP4Config.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.DHCP6Config.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.IP4Config.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.IP6Config.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.SecretAgent.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Statistics.xml"/> - <xi:include href="dbus-org.freedesktop.NetworkManager.DnsManager.xml"/> - </section> - <section id="dbus-types"> - <title>Types</title> - <xi:include href="../../libnm-core/nm-dbus-types.xml"/> - <xi:include href="../../libnm-core/nm-vpn-dbus-types.xml"/> - </section> - </chapter> - <chapter id="ref-settings"> <title>Network Configuration Setting Specification</title> <para> @@ -192,6 +135,63 @@ </section> </chapter> + <chapter id="spec"> + <title>D-Bus API Reference</title> + + <para> + This part documents the D-Bus interface used to access the + NetworkManager daemon. + </para> + + <section id="dbus-interfaces"> + <title>Interfaces</title> + <!-- TODO: Split me into chapters about daemon, vpn plugins, dispatcher and the secret agent. + Then describe the daemon's singletons and object hierarchy. --> + <xi:include href="dbus-org.freedesktop.NetworkManager.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Settings.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.AgentManager.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.AccessPoint.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.PPP.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Settings.Connection.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.VPN.Connection.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Connection.Active.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Adsl.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bond.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bridge.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Bluetooth.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Dummy.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Wired.xml"/> + <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.Macsec.xml"/> + <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.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.DHCP4Config.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.DHCP6Config.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.IP4Config.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.IP6Config.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.VPN.Plugin.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.SecretAgent.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.Device.Statistics.xml"/> + <xi:include href="dbus-org.freedesktop.NetworkManager.DnsManager.xml"/> + </section> + <section id="dbus-types"> + <title>Types</title> + <xi:include href="../../libnm-core/nm-dbus-types.xml"/> + <xi:include href="../../libnm-core/nm-vpn-dbus-types.xml"/> + </section> + </chapter> + <index> <title>Index</title> </index> |