Merge branch 'upstream/latest' of https://salsa.debian.org/utopia-team/network-manager into upstream

1 files changed, 32 insertions, 2 deletions

diff --git a/docs/api/network-manager-docs.xml b/docs/api/network-manager-docs.xml
index 8cf97585..fd7a1c3e 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>