From f01787aaab33a38d1e10c507b66c9f7469ad9bc4 Mon Sep 17 00:00:00 2001
From: Jenkins for Enea Linux Test Framework <eltf@list.enea.se>
Date: Wed, 13 Nov 2019 18:34:54 +0100
Subject: Updated licenses.xml

---
 .../doc/licenses.xml                               | 60 +++-------------------
 1 file changed, 6 insertions(+), 54 deletions(-)

(limited to 'doc/book-enea-nfv-access-sdk-open-source/doc/licenses.xml')

diff --git a/doc/book-enea-nfv-access-sdk-open-source/doc/licenses.xml b/doc/book-enea-nfv-access-sdk-open-source/doc/licenses.xml
index 141c208..4f59798 100644
--- a/doc/book-enea-nfv-access-sdk-open-source/doc/licenses.xml
+++ b/doc/book-enea-nfv-access-sdk-open-source/doc/licenses.xml
@@ -1157,7 +1157,7 @@ specific documentation.-->
  <entry>libgcc</entry>
  <entry>7.3.0</entry>
  <entry>GNU cc and gcc C compilers.</entry>
- <entry>GPL-3.0-with-GCC-exception</entry>
+ <entry> GPL-3.0-with-GCC-exception, GPL-3.0</entry>
 </row>
 <row>
  <entry>libgcrypt</entry>
@@ -1945,12 +1945,6 @@ specific documentation.-->
  <entry>The concurrent.futures module provides a high-level interface for asynchronously executing callables.</entry>
  <entry>BSD</entry>
 </row>
-<row>
- <entry>python-idna</entry>
- <entry>2.6</entry>
- <entry>Internationalised Domain Names in Applications.</entry>
- <entry> BSD-3-Clause, Python-2.0, Unicode</entry>
-</row>
 <row>
  <entry>python-ipaddress</entry>
  <entry>1.0.18</entry>
@@ -8324,48 +8318,6 @@ SUCH DAMAGE.
 </programlisting></para></section>
 
 <section id="lic_43">
-<title>Unicode</title>
-<para><programlisting>
-COPYRIGHT AND PERMISSION NOTICE
-
-Copyright 1991-2015 Unicode, Inc. All rights reserved.
-Distributed under the Terms of Use in
-http://www.unicode.org/copyright.html.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Unicode data files and any associated documentation
-(the "Data Files") or Unicode software and any associated documentation
-(the "Software") to deal in the Data Files or Software
-without restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, and/or sell copies of
-the Data Files or Software, and to permit persons to whom the Data Files
-or Software are furnished to do so, provided that
-(a) this copyright and permission notice appear with all copies
-of the Data Files or Software,
-(b) this copyright and permission notice appear in associated
-documentation, and
-(c) there is clear notice in each modified Data File or in the Software
-as well as in the documentation associated with the Data File(s) or
-Software that the data or software has been modified.
-
-THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
-ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT OF THIRD PARTY RIGHTS.
-IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
-NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
-DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THE DATA FILES OR SOFTWARE.
-
-Except as contained in this notice, the name of a copyright holder
-shall not be used in advertising or otherwise to promote the sale,
-use or other dealings in these Data Files or Software without prior
-written authorization of the copyright holder.
-</programlisting></para></section>
-
-<section id="lic_44">
 <title>W3C</title>
 <para><programlisting>
 
@@ -8410,7 +8362,7 @@ GPL compatibility and OSI`s certification under the Open Source Definition.
 
 </programlisting></para></section>
 
-<section id="lic_45">
+<section id="lic_44">
 <title>ZPL-2.1</title>
 <para><programlisting>
 
@@ -8451,7 +8403,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 </programlisting></para></section>
 
-<section id="lic_46">
+<section id="lic_45">
 <title>Zlib</title>
 <para><programlisting>
 
@@ -8477,7 +8429,7 @@ zlib License
 
 </programlisting></para></section>
 
-<section id="lic_47">
+<section id="lic_46">
 <title>tcl</title>
 <para><programlisting>
 This software is copyrighted by the Regents of the University of
@@ -8525,7 +8477,7 @@ terms specified in this license.
   </section> 
  <section id="proprietary_license">
  <title>Proprietary Licenses</title>
-<section id="lic_48">
+<section id="lic_47">
 <title>Enea</title>
 <para><programlisting>
  Copyright (C) 2006 by Enea.
@@ -8543,7 +8495,7 @@ terms specified in this license.
  any actual or intended publication of such Software.
 </programlisting></para></section>
 
-<section id="lic_49">
+<section id="lic_48">
 <title>Windbase</title>
 <para><programlisting>
 This file contains valuable trade secrets and proprietary
-- 
cgit v1.2.3-54-g00ecf