Merge branch 'release/debian/1.0-1'debian/1.0-1

1 files changed, 20 insertions, 17 deletions

diff --git a/doc/libunistring.texi b/doc/libunistring.texi
index cb5abdd..428e8c6 100644
--- a/doc/libunistring.texi
+++ b/doc/libunistring.texi
@@ -98,7 +98,7 @@ This manual is for GNU libunistring.
 
 @ignore
 @c This was: @copying but it triggers a makeinfo 4.13 bug
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2022 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
@@ -123,14 +123,13 @@ A copy of the license is included in @ref{GNU GPL}.
 @titlepage
 @title GNU libunistring, version @value{VERSION}
 @subtitle updated @value{UPDATED}
-@subtitle Edition @value{EDITION}, @value{UPDATED}
 @author Bruno Haible
 
 @ifnothtml
 @page
 @vskip 0pt plus 1filll
 @c @insertcopying
-Copyright (C) 2001-2018 Free Software Foundation, Inc.
+Copyright (C) 2001-2022 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
@@ -179,6 +178,7 @@ A copy of the license is included in @ref{GNU GPL}.
 * Using the library::           How to link with the library and use it?
 * More functionality::          More advanced functionality
 * The wchar_t mess::            Why @code{wchar_t *} strings are useless
+* The char32_t problem::        Why @code{char32_t *} strings are problematic
 * Licenses::                    Licenses
 
 * Index::                       General Index
@@ -392,14 +392,14 @@ Japanese, even the processing of pure Japanese text was error prone.
 References:
 @itemize @bullet
 @item
-The Unicode standard:@texnl{} @url{http://www.unicode.org/}
+The Unicode standard:@texnl{} @url{https://www.unicode.org/}
 @item
-Definition of UTF-8:@texnl{} @url{http://www.rfc-editor.org/rfc/rfc3629.txt}
+Definition of UTF-8:@texnl{} @url{https://www.rfc-editor.org/rfc/rfc3629.txt}
 @item
-Definition of UTF-16:@texnl{} @url{http://www.rfc-editor.org/rfc/rfc2781.txt}
+Definition of UTF-16:@texnl{} @url{https://www.rfc-editor.org/rfc/rfc2781.txt}
 @item
 Markus Kuhn's UTF-8 and Unicode FAQ:@texnl{}
-@url{http://www.cl.cam.ac.uk/~mgk25/unicode.html}
+@url{https://www.cl.cam.ac.uk/~mgk25/unicode.html}
 @end itemize
 
 @node Unicode and i18n
@@ -595,7 +595,7 @@ functions do not work with multibyte strings.
 @end itemize
 
 The workarounds can be found in GNU gnulib
-@url{http://www.gnu.org/software/gnulib/}.
+@url{https://www.gnu.org/software/gnulib/}.
 @itemize @bullet
 @item
 gnulib has modules @samp{mbchar}, @samp{mbiter}, @samp{mbuiter} that
@@ -863,7 +863,7 @@ that uses @code{libunistring} was installed.
 GNU Gnulib provides an autoconf macro that tests for the availability
 of @code{libunistring}.  It is contained in the Gnulib module
 @samp{libunistring}, see@texnl{}
-@url{http://www.gnu.org/software/gnulib/MODULES.html#module=libunistring}.
+@url{https://www.gnu.org/software/gnulib/MODULES.html#module=libunistring}.
 
 @amindex gl_LIBUNISTRING
 The macro is called @code{gl_LIBUNISTRING}.  It searches for an installed
@@ -901,10 +901,10 @@ on most systems.
 @cindex bug reports
 @cindex bug tracker
 @cindex mailing list
-If you encounter any problem, please don't hesitate to send a detailed
-bug report to the @code{bug-libunistring@@gnu.org} mailing list.  You can
-alternatively also use the bug tracker at the project page
-@url{https://savannah.gnu.org/projects/libunistring}.
+If you encounter any problem, please don't hesitate to submit a detailed
+bug report either in the bug tracker at the project page
+@url{https://savannah.gnu.org/projects/libunistring}, or by email
+to the @code{bug-libunistring@@gnu.org} mailing list.
 
 Please always include the version number of this library, and a short
 description of your operating system and compilation environment with
@@ -924,10 +924,12 @@ For bidirectional reordering of strings, we recommend the GNU FriBidi library:
 @cindex rendering
 For the rendering of Unicode strings outside of the context of a given toolkit
 (KDE/Qt or GNOME/Gtk), we recommend the Pango library:
-@url{http://www.pango.org/}.
+@url{https://www.pango.org/}.
 
 @include wchar_t.texi
 
+@include char32_t.texi
+
 @node Licenses
 @appendix Licenses
 @cindex Licenses
@@ -938,15 +940,16 @@ particular file or directory.  Here is a summary:
 @itemize @bullet
 @item
 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
+"the GNU LGPLv3+ or the GNU GPLv2+". This means, you can use it under either
 @itemize @bullet
 @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
+the terms of the GNU General Public License (GPL) version 2 or
+(at your option) any later version, or
 @item @minus{}
-the same dual license "the GNU LGPLv3+ or the GNU GPLv2".
+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}.