Merge tag 'upstream/0.9.7'

Upstream version 0.9.7

1 files changed, 30 insertions, 17 deletions

diff --git a/doc/libunistring.info b/doc/libunistring.info
index e981a3e..52882c2 100644
--- a/doc/libunistring.info
+++ b/doc/libunistring.info
@@ -1,4 +1,4 @@
-This is libunistring.info, produced by makeinfo version 5.2 from
+This is libunistring.info, produced by makeinfo version 6.1 from
 libunistring.texi.
 
 INFO-DIR-SECTION Software development
@@ -3902,7 +3902,7 @@ the file ‘DEPENDENCIES’.
 
    Then you can proceed to build and install the library, as described
 in the file ‘INSTALL’.  For installation on Windows systems, please
-refer to the file ‘README.woe32’.
+refer to the file ‘README.windows’.
 
 
 File: libunistring.info,  Node: Compiler options,  Next: Include files,  Prev: Installation,  Up: Using the library
@@ -4044,9 +4044,22 @@ Appendix A Licenses
    The files of this package are covered by the licenses indicated in
 each particular file or directory.  Here is a summary:
 
-   • The ‘libunistring’ library is covered by the GNU Lesser General
-     Public License (LGPL). A copy of the license is included in *note
-     GNU LGPL::.
+   • The ‘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
+        • − the terms of the GNU Lesser General Public License (LGPL)
+          version 3 or (at your option) any later version, or
+        • − the terms of the GNU General Public License (GPL) version 2,
+          or
+        • − the same dual license "the GNU LGPLv3+ or the GNU GPLv2".
+     You find the GNU LGPL version 3 in *note GNU LGPL::.  This license
+     is based on the GNU GPL version 3, see *note GNU GPL::.
+     You can find the GNU GPL version 2 at
+     <https://www.gnu.org/licenses/old-licenses/gpl-2.0.html>.
+     Note: This dual license makes it possible for the ‘libunistring’
+     library to be used by packages under GPLv2 or GPLv2+ licenses, in
+     particular.  See the table in
+     <https://www.gnu.org/licenses/gpl-faq.html#AllCompatibility>.
 
    • This manual is free documentation.  It is dually licensed under the
      GNU FDL and the GNU GPL. This means that you can redistribute this
@@ -4975,7 +4988,7 @@ A.3 GNU Free Documentation License
   0. PREAMBLE
 
      The purpose of this License is to make a manual, textbook, or other
-     functional and useful document "free" in the sense of freedom: to
+     functional and useful document “free” in the sense of freedom: to
      assure everyone the effective freedom to copy and redistribute it,
      with or without modifying it, either commercially or
      noncommercially.  Secondarily, this License preserves for the
@@ -5425,7 +5438,7 @@ notices just after the title page:
        Free Documentation License''.
 
    If you have Invariant Sections, Front-Cover Texts and Back-Cover
-Texts, replace the “with…Texts.” line with this:
+Texts, replace the “with...Texts.” line with this:
 
          with the Invariant Sections being LIST THEIR TITLES, with
          the Front-Cover Texts being LIST, and with the Back-Cover Texts
@@ -6503,16 +6516,16 @@ Node: Case detection159564
 Node: uniregex.h162878
 Node: Using the library163105
 Node: Installation163516
-Node: Compiler options164001
-Node: Include files165641
-Node: Autoconf macro166894
-Node: Reporting problems168534
-Node: More functionality169352
-Node: Licenses169795
-Node: GNU GPL171433
-Node: GNU LGPL209178
-Node: GNU FDL217661
-Node: Index242966
+Node: Compiler options164003
+Node: Include files165643
+Node: Autoconf macro166896
+Node: Reporting problems168536
+Node: More functionality169354
+Node: Licenses169797
+Node: GNU GPL172228
+Node: GNU LGPL209973
+Node: GNU FDL218456
+Node: Index243765
 
 End Tag Table