summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2018-10-25 10:20:33 +0200
committerThomas Haller <thaller@redhat.com>2018-10-25 11:08:39 +0200
commit168e8b9b6fccf0145dd2fac784612953d94285d4 (patch)
treeb13087f59c4088e8072fba0d6a79f1af352a9db2 /docs
parentcacd3be1a9dc335b429e21253ef27e2db0ef4e3f (diff)
downloadNetworkManager-168e8b9b6fccf0145dd2fac784612953d94285d4.tar.gz
build: fix check-docs.sh for out-of-tree builds
Fixes: 7a59cd274485e4c0345c563d48e516967630d7f0
Diffstat (limited to 'docs')
-rw-r--r--docs/api/network-manager-docs.xml9
-rw-r--r--docs/libnm/libnm-docs.xml7
-rw-r--r--docs/meson.build2
3 files changed, 1 insertions, 17 deletions
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index ec2712474b..06ac37415d 100644
--- a/docs/api/network-manager-docs.xml
+++ b/docs/api/network-manager-docs.xml
@@ -257,15 +257,6 @@
<title>Types</title>
<xi:include href="../../libnm-core/nm-dbus-types.xml"/>
</chapter>
-
- <!--
- These are obsolete and intentionally omitted 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">
diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml
index 3597d84972..eb4f6cf585 100644
--- a/docs/libnm/libnm-docs.xml
+++ b/docs/libnm/libnm-docs.xml
@@ -294,13 +294,6 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in
<xi:include href="xml/nm-vpn-plugin-old.xml"/>
</chapter>
- <!--
- These don't contain any useful documentation. 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"/>
diff --git a/docs/meson.build b/docs/meson.build
index 1fb21fb47d..92e6d6e9b9 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -14,5 +14,5 @@ endif
test(
'check-docs',
find_program(join_paths(meson.source_root(), 'tools', 'check-docs.sh')),
- args: [meson.source_root()]
+ args: [meson.source_root(), meson.build_root()]
)