summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-03-24 13:30:52 +0100
committerLubomir Rintel <lkundrak@v3.sk>2016-03-26 11:28:19 +0100
commit5ce4c9fd84df9c0d8c31f20b8d6771019360c2ef (patch)
tree529d65f94fdc6bb12682f7eb925316a4624cfe28
parent8f8c15fb3a8e12f51f188899919b99f276dc5ef6 (diff)
downloadNetworkManager-5ce4c9fd84df9c0d8c31f20b8d6771019360c2ef.tar.gz
docs: add manual pages to docbook documentation
This way they will make it to developer.gnome.org.
-rw-r--r--docs/api/Makefile.am8
-rw-r--r--docs/api/network-manager-docs.xml11
2 files changed, 18 insertions, 1 deletions
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index b9d6cfaa28..666bad0048 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -84,7 +84,13 @@ expand_content_files = \
$(top_builddir)/introspection/nmdbus-device-veth-org.freedesktop.NetworkManager.Device.Veth.xml \
$(top_builddir)/introspection/nmdbus-settings-org.freedesktop.NetworkManager.Settings.xml \
$(top_builddir)/introspection/nmdbus-device-ethernet-org.freedesktop.NetworkManager.Device.Wired.xml \
- $(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml
+ $(top_builddir)/introspection/nmdbus-ip4-config-org.freedesktop.NetworkManager.IP4Config.xml \
+ $(top_builddir)/man/NetworkManager.xml \
+ $(top_builddir)/man/NetworkManager.conf.xml \
+ $(top_builddir)/man/nmcli-examples.xml \
+ $(top_builddir)/man/nm-settings.xml \
+ $(top_builddir)/man/nm-settings-keyfile.xml \
+ $(top_builddir)/man/nm-settings-ifcfg-rh.xml
include $(top_srcdir)/gtk-doc.make
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index 2035bb5b02..48f592653c 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -142,6 +142,17 @@
</section>
</chapter>
+ <chapter id="manpages">
+ <title>UNIX Manual Pages</title>
+ <xi:include href="xml/NetworkManager.xml"/>
+ <xi:include href="xml/NetworkManager.conf.xml"/>
+ <xi:include href="xml/nmcli-examples.xml"/>
+ <xi:include href="xml/nm-settings.xml"><xi:fallback /></xi:include>
+ <xi:include href="xml/nm-settings-keyfile.xml"><xi:fallback /></xi:include>
+ <xi:include href="xml/nm-settings-ifcfg-rh.xml"><xi:fallback /></xi:include>
+ </chapter>
+
+
<index>
<title>Index</title>
</index>