From: Lubomir Rintel <lkundrak@v3.sk>
Date: Thu, 24 Mar 2016 12:30:52 +0000 (+0100)
Subject: docs: add manual pages to docbook documentation
X-Git-Url: https://iam.tj/gitweb/gitweb.cgi?p=NetworkManager.git;a=commitdiff_plain;h=5ce4c9fd84df9c0d8c31f20b8d6771019360c2ef

docs: add manual pages to docbook documentation

This way they will make it to developer.gnome.org.
---

diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index b9d6cfaa2..666bad004 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 2035bb5b0..48f592653 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>