Update.

	* manual/message.texi (Advanced gettext functions): Change
	description of plural forms for Slovak.
	Reported by Marcel Telka <marcel@telka.sk>.

	* manuaL/time.texi (Low-Level Time String Parsing): Fix description of
	%z.  Reported by C. Scott Ananian <cananian@lesser-magoo.lcs.mit.edu>.

2001-08-26  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/s390/s390-32/dl-machine.h (elf_machine_lazy_rel): Fix a
	typo.  Patch by Florian La Roche <laroche@redhat.com>.

2001-08-26  Ulrich Drepper  <drepper@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 7ba5e66..ed8c80f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2001-08-26  Ulrich Drepper  <drepper@redhat.com>
 
+       * manual/message.texi (Advanced gettext functions): Change
+       description of plural forms for Slovak.
+       Reported by Marcel Telka <marcel@telka.sk>.
+
+       * manuaL/time.texi (Low-Level Time String Parsing): Fix description of
+       %z.  Reported by C. Scott Ananian <cananian@lesser-magoo.lcs.mit.edu>.
+
+2001-08-26  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/s390/s390-32/dl-machine.h (elf_machine_lazy_rel): Fix a
+       typo.  Patch by Florian La Roche <laroche@redhat.com>.
+
+2001-08-26  Ulrich Drepper  <drepper@redhat.com>
+
        * include/link.h (struct link_map): Add l_lookup_cache element.
        * elf/dl-reloc.c (RESOLVE): Add symbol caching here.
        (RESOLVE_MAP): Likewise.

diff --git a/manual/message.texi b/manual/message.texi
index ff410f0..b55d9ae 100644 (file)
--- a/manual/message.texi
+++ b/manual/message.texi
@@ -1313,7 +1313,23 @@ Languages with this property include:
 
 @table @asis
 @item Slavic family
-Czech, Russian, Slovak
+Czech, Russian
+@end table
+
+@item Three forms, special cases for 1 and 2, 3, 4
+The header entry would look like this:
+
+@smallexample
+Plural-Forms: nplurals=3; \
+    plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;
+@end smallexample
+
+@noindent
+Languages with this property include:
+
+@table @asis
+@item Slavic family
+Slovak
 @end table
 
 @item Three forms, special case for one and some numbers ending in 2, 3, or 4
@@ -1389,7 +1405,7 @@ If the @var{codeset} parameter is the null pointer,
 for the domain with the name @var{domainname}. It returns @code{NULL} if
 no codeset has yet been selected.
 
-The @code{bind_textdomain_codeset} function can be used several times. 
+The @code{bind_textdomain_codeset} function can be used several times.
 If used multiple times with the same @var{domainname} argument, the
 later call overrides the settings made by the earlier one.
 

diff --git a/manual/time.texi b/manual/time.texi
index 62c7b5f..27060b5 100644 (file)
--- a/manual/time.texi
+++ b/manual/time.texi
@@ -1743,8 +1743,7 @@ The year as a decimal number, using the Gregorian calendar.
 The full alternative year representation.
 
 @item %z
-Equivalent to the use of @code{%a, %d %b %Y %H:%M:%S %z} in this place.
-This is the full @w{ISO 8601} date and time format.
+The offset from GMT in @w{ISO 8601}/RFC822 format.
 
 @item %Z
 The timezone name.

diff --git a/sysdeps/s390/s390-32/dl-machine.h b/sysdeps/s390/s390-32/dl-machine.h
index d0c2f7c..8028f62 100644 (file)
--- a/sysdeps/s390/s390-32/dl-machine.h
+++ b/sysdeps/s390/s390-32/dl-machine.h
@@ -453,7 +453,7 @@ elf_machine_lazy_rel (struct link_map *map,
   Elf32_Addr *const reloc_addr = (void *) (l_addr + reloc->r_offset);
   const unsigned int r_type = ELF32_R_TYPE (reloc->r_info);
   /* Check for unexpected PLT reloc type.  */
-  if (__builtin_expect (r_type == R_390_JMP_SLOT, 1)))
+  if (__builtin_expect (r_type == R_390_JMP_SLOT, 1))
     *reloc_addr += l_addr;
   else
     _dl_reloc_bad_type (map, r_type, 1);