diff options
| author | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:53 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-01-22 00:29:53 +0100 |
| commit | 4d939c60d4ac257a2977871baf3b8b3671b5a4f7 (patch) | |
| tree | 318c08dea542d7865422af76e2d36a9559340cd3 /docs/api/network-manager-docs.xml | |
| parent | bb9eef75b2aaaab741e2b99911c8be3db6d1bc0b (diff) | |
| parent | 2c032d8f1c6292c1338a615e6ec40252889ba85c (diff) | |
Merge tag 'upstream/1.0.0' into experimental
Upstream version 1.0.0
Diffstat (limited to 'docs/api/network-manager-docs.xml')
| -rw-r--r-- | docs/api/network-manager-docs.xml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index fadc8862..0f9c7dbb 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -54,7 +54,17 @@ setting names (like "wimax" or "bluetooth") to a dictionary of key/value pairs that represents each itself. </para> - <xi:include href="settings-spec.xml" /> + <xi:include href="settings-spec.xml"> + <xi:fallback> + <section> + <title>Configuration Settings</title> + <note><para> + (NetworkManager was built without full introspection support. Setting + documentation is not available.) + </para></note> + </section> + </xi:fallback> + </xi:include> <section id="secrets-flags"> <title>Secret flag types</title> <para> |