summaryrefslogtreecommitdiff
path: root/doc/libunistring_18.html
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-03-27 21:42:03 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-03-27 21:42:03 +0200
commitdb6f1f397f45ccd3c11d16352ed46a9c1eae3442 (patch)
treee0b9334e2637f17696c796ac13b2c39294bf9233 /doc/libunistring_18.html
parent0250cb64565a7d5238bbc751225d4b0236ef8316 (diff)
parent6b73edd95d603e27d55d4905134ac1327d426534 (diff)
Merge tag 'upstream/0.9.7'
Upstream version 0.9.7
Diffstat (limited to 'doc/libunistring_18.html')
-rw-r--r--doc/libunistring_18.html28
1 files changed, 23 insertions, 5 deletions
diff --git a/doc/libunistring_18.html b/doc/libunistring_18.html
index 40a5e2e0..eaaeeb99 100644
--- a/doc/libunistring_18.html
+++ b/doc/libunistring_18.html
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html401/loose.dtd">
<html>
-<!-- Created on July, 8 2015 by texi2html 1.78a -->
+<!-- Created on December, 2 2016 by texi2html 1.78a -->
<!--
Written by: Lionel Cons <Lionel.Cons@cern.ch> (original author)
Karl Berry <karl@freefriends.org>
@@ -65,9 +65,27 @@ particular file or directory. Here is a summary:
</p>
<ul>
<li>
-The <code>libunistring</code> library is covered by the
-GNU Lesser General Public License (LGPL).
-A copy of the license is included in <a href="#SEC74">GNU LESSER GENERAL PUBLIC LICENSE</a>.
+The <code>libunistring</code> library and its header files are dual-licensed under
+&quot;the GNU LGPLv3+ or the GNU GPLv2&quot;. This means, you can use it under either
+<ul class="toc">
+<li> -
+the terms of the GNU Lesser General Public License (LGPL) version 3 or
+(at your option) any later version, or
+</li><li> -
+the terms of the GNU General Public License (GPL) version 2, or
+</li><li> -
+the same dual license &quot;the GNU LGPLv3+ or the GNU GPLv2&quot;.
+</li></ul>
+<p>You find the GNU LGPL version 3 in <a href="#SEC74">GNU LESSER GENERAL PUBLIC LICENSE</a>. This license is
+based on the GNU GPL version 3, see <a href="#SEC69">GNU GENERAL PUBLIC LICENSE</a>.
+<br>
+You can find the GNU GPL version 2 at
+<a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">https://www.gnu.org/licenses/old-licenses/gpl-2.0.html</a>.
+<br>
+Note: This dual license makes it possible for the <code>libunistring</code> library
+to be used by packages under GPLv2 or GPLv2+ licenses, in particular. See
+the table in <a href="https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility">https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility</a>.
+</p>
</li><li>
This manual is free documentation. It is dually licensed under the
@@ -1517,7 +1535,7 @@ to permit their use in free software.
</tr></table>
<p>
<font size="-1">
- This document was generated by <em>Daiki Ueno</em> on <em>July, 8 2015</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.78a</em></a>.
+ This document was generated by <em>Daiki Ueno</em> on <em>December, 2 2016</em> using <a href="http://www.nongnu.org/texi2html/"><em>texi2html 1.78a</em></a>.
</font>
<br>