diff options
author | Lubomir Rintel <lkundrak@v3.sk> | 2019-09-07 18:48:10 +0200 |
---|---|---|
committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-09-10 11:10:52 +0200 |
commit | 66f75ce34d5afe7f719db15bb36186121fcbef74 (patch) | |
tree | 2caf27c83d9a982e39123dd36474a04f79c18d9e /docs | |
parent | e9f2ea6c22f36cb7986d2228763629ed44b9e76b (diff) | |
download | NetworkManager-66f75ce34d5afe7f719db15bb36186121fcbef74.tar.gz |
docs: include the license boilerplate instead of full GPL text
What's actually needed here is an explaination of how the license
applies along with the explanation where to find the full text.
Also, the libnm documentation was lacking the licensing information
altogether. Fix fixes it too.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/api/Makefile.am | 1 | ||||
-rw-r--r-- | docs/api/meson.build | 1 | ||||
-rw-r--r-- | docs/api/network-manager-docs.xml | 34 | ||||
-rw-r--r-- | docs/libnm/libnm-docs.xml | 40 |
4 files changed, 71 insertions, 5 deletions
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index 33ca2e35e3..44933bc980 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -91,7 +91,6 @@ content_files = \ $(top_builddir)/man/nm-settings.xml \ $(top_builddir)/man/nm-settings-keyfile.xml \ version.xml \ - ../../COPYING \ $(NULL) diff --git a/docs/api/meson.build b/docs/api/meson.build index 6b3a0fa772..62c5b8c926 100644 --- a/docs/api/meson.build +++ b/docs/api/meson.build @@ -20,7 +20,6 @@ configure_file( configuration: version_conf, ) -content_files += join_paths(meson.source_root(), 'COPYING') filecopier = find_program('cp') foreach intro : introspection_files path = intro[1].split('/')[-1] diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml index 8cf97585a0..fd7a1c3ec4 100644 --- a/docs/api/network-manager-docs.xml +++ b/docs/api/network-manager-docs.xml @@ -295,11 +295,41 @@ </index> <!-- License --> - <appendix id="license"> <title>License</title> + + <para> + This program is free software; you can redistribute + it and/or modify it under the terms of the <citetitle>GNU + General Public License</citetitle> as published by the Free + Software Foundation; either version 2 of the License, or + (at your option) any later version. + </para> + + <para> + This program is distributed in the hope that it will + be useful, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU General Public License for + more details. + </para> + + <para> + You should have received a copy of the <citetitle>GNU + General Public License</citetitle> along with this program; + if not, write to the + <address> + Free Software Foundation, Inc., + <street>51 Franklin Street</street> - Fifth Floor, + <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>, + <country>USA</country> + </address> + </para> + <para> -<programlisting><xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../../COPYING" parse="text"><xi:fallback>FIXME: MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting> + A copy of the <citetitle>GNU General Public License</citetitle> + can also be obtained from the <ulink url="https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html"> + GNU web site</ulink>. </para> </appendix> </book> diff --git a/docs/libnm/libnm-docs.xml b/docs/libnm/libnm-docs.xml index c6471348ca..b66e95ef5a 100644 --- a/docs/libnm/libnm-docs.xml +++ b/docs/libnm/libnm-docs.xml @@ -309,5 +309,43 @@ print ("NetworkManager version " + client.get_version())]]></programlisting></in </index> <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include> -</book> + <appendix id="license"> + <title>License</title> + + <para> + This library is free software; you can redistribute + it and/or modify it under the terms of the <citetitle>GNU + Lesser General Public License</citetitle> as published by + the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + </para> + + <para> + This library is distributed in the hope that it will + be useful, but WITHOUT ANY WARRANTY; without even the + implied warranty of MERCHANTABILITY or FITNESS FOR A + PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + </para> + + <para> + You should have received a copy of the <citetitle>GNU + Lesser General Public License</citetitle> along with this + library; if not, write to the + <address> + Free Software Foundation, Inc., + <street>51 Franklin Street</street> - Fifth Floor, + <city>Boston</city>, <state>MA</state> <postcode>02110-1301</postcode>, + <country>USA</country> + </address> + </para> + + <para> + A copy of the <citetitle>GNU Lesser General Public License</citetitle> + can also be obtained from the <ulink url="https://www.gnu.org/licenses/old-licenses/lgpl-2.1.en.html"> + GNU web site</ulink>. + </para> + </appendix> + +</book> |