Merge branch 'release/debian/1.2-1'HEADdebian/1.2-1master

1 files changed, 5 insertions, 2 deletions

diff --git a/doc/unicase.texi b/doc/unicase.texi
index de8442c2..c2350c73 100644
--- a/doc/unicase.texi
+++ b/doc/unicase.texi
@@ -48,7 +48,7 @@ The titlecase mapping of a character is to be used when the character should
 look like upper case and the following characters are lower cased.
 
 For most characters, this is the same as the uppercase mapping.  There are
-only few characters where the title case variant and the uuper case variant
+only few characters where the title case variant and the upper case variant
 are different.  These characters occur in the Latin writing of the Croatian,
 Bosnian, and Serbian languages.
 
@@ -80,7 +80,7 @@ Bosnian, and Serbian languages.
 @cindex lowercasing
 @cindex titlecasing
 Case mapping should always be performed on entire strings, not on individual
-characters.  The functions in this sections do so.
+characters.  The functions in this section do so.
 
 These functions allow to apply a normalization after the case mapping.  The
 reason is that if you want to treat @samp{@"{a}} and @samp{@"{A}} the same,
@@ -282,6 +282,9 @@ The @var{resultbuf} and @var{lengthp} arguments are as described in
 chapter @ref{Conventions}.
 @end deftypefun
 
+The following functions ignore locale-dependent collation rules, but do
+use locale-dependent case mappings (if @var{iso639_language} is not NULL).
+
 @deftypefun int u8_casecmp (const@tie{}uint8_t@tie{}*@var{s1}, size_t@tie{}@var{n1}, const@tie{}uint8_t@tie{}*@var{s2}, size_t@tie{}@var{n2}, const@tie{}char@tie{}*@var{iso639_language}, uninorm_t@tie{}@var{nf}, int@tie{}*@var{resultp})
 @deftypefunx int u16_casecmp (const@tie{}uint16_t@tie{}*@var{s1}, size_t@tie{}@var{n1}, const@tie{}uint16_t@tie{}*@var{s2}, size_t@tie{}@var{n2}, const@tie{}char@tie{}*@var{iso639_language}, uninorm_t@tie{}@var{nf}, int@tie{}*@var{resultp})
 @deftypefunx int u32_casecmp (const@tie{}uint32_t@tie{}*@var{s1}, size_t@tie{}@var{n1}, const@tie{}uint32_t@tie{}*@var{s2}, size_t@tie{}@var{n2}, const@tie{}char@tie{}*@var{iso639_language}, uninorm_t@tie{}@var{nf}, int@tie{}*@var{resultp})