system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-14 20:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

docs: include the license boilerplate instead of full GPL text

Browse source 
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.
This commit is contained in:
Lubomir Rintel 2019-09-07 18:48:10 +02:00
parent e9f2ea6c22
commit 66f75ce34d
4 changed files with 71 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/api/Makefile.am
View file

@ -91,7 +91,6 @@ content_files = \
$(top_builddir)/man/nm-settings.xml \
$(top_builddir)/man/nm-settings-keyfile.xml \
version.xml \
../../COPYING \
$(NULL)

1
docs/api/meson.build
View file

@ -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]

34
docs/api/network-manager-docs.xml
View file

@ -295,11 +295,41 @@
</index>
<!-- License -->
<appendix id="license">
<title>License</title>
<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>
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>
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>

40
docs/libnm/libnm-docs.xml
View file

@ -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>