summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2016-12-02 04:00:33 +0100
committerBruno Haible <bruno@clisp.org>2016-12-02 04:02:52 +0100
commit5705307b89e16446a0801fa73524593b3f1157b5 (patch)
treed93fd910059bc8a08de2b0630dc28418b0689f1d /doc
parent76524497421bcb79f863504b024ac5423cd7e0f1 (diff)
downloadlibunistring-5705307b89e16446a0801fa73524593b3f1157b5.tar.gz
Change license to LGPLv3+ or GPLv2.
Diffstat (limited to 'doc')
-rw-r--r--doc/libunistring.texi28
1 files changed, 23 insertions, 5 deletions
diff --git a/doc/libunistring.texi b/doc/libunistring.texi
index 15baa3a..43a6ba5 100644
--- a/doc/libunistring.texi
+++ b/doc/libunistring.texi
@@ -86,7 +86,7 @@ This manual is for GNU libunistring.
@ignore
@c This was: @copying but it triggers a makeinfo 4.13 bug
-Copyright (C) 2001-2010 Free Software Foundation, Inc.
+Copyright (C) 2001-2016 Free Software Foundation, Inc.
This manual is free documentation. It is dually licensed under the
GNU FDL and the GNU GPL. This means that you can redistribute this
@@ -118,7 +118,7 @@ A copy of the license is included in @ref{GNU GPL}.
@page
@vskip 0pt plus 1filll
@c @insertcopying
-Copyright (C) 2001-2010 Free Software Foundation, Inc.
+Copyright (C) 2001-2016 Free Software Foundation, Inc.
This manual is free documentation. It is dually licensed under the
GNU FDL and the GNU GPL. This means that you can redistribute this
@@ -937,9 +937,27 @@ particular file or directory. Here is a summary:
@itemize @bullet
@item
-The @code{libunistring} library is covered by the
-GNU Lesser General Public License (LGPL).
-A copy of the license is included in @ref{GNU LGPL}.
+The @code{libunistring} library and its header files are dual-licensed under
+"the GNU LGPLv3+ or the GNU GPLv2". This means, you can use it under either
+@itemize
+@item @minus{}
+the terms of the GNU Lesser General Public License (LGPL) version 3 or
+(at your option) any later version, or
+@item @minus{}
+the terms of the GNU General Public License (GPL) version 2, or
+@item @minus{}
+the same dual license "the GNU LGPLv3+ or the GNU GPLv2".
+@end itemize
+You find the GNU LGPL version 3 in @ref{GNU LGPL}. This license is
+based on the GNU GPL version 3, see @ref{GNU GPL}.
+@*
+You can find the GNU GPL version 2 at
+@url{https://www.gnu.org/licenses/old-licenses/gpl-2.0.html}.
+@*
+Note: This dual license makes it possible for the @code{libunistring} library
+to be used by packages under GPLv2 or GPLv2+ licenses, in particular. See
+the table in @url{https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility}.
+
@item
This manual is free documentation. It is dually licensed under the