Update.

2001-05-25  Bruce Mitchener  <bruce@cubik.org>

	* manual/ctype.texi: Minor fix.
	* manual/install.texi: Likewise.
	* manual/startup.texi: Likewise.
	* manual/examples/dir.c: Use perror() rather than puts().

2001-05-25  David Mosberger  <davidm@hpl.hp.com>

	* sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h: Put stuff following
	#endif directive inside a comment to avoid compiler warnings.

2001-05-25  Philipp Thomas  <pthomas@suse.de>

	* nis/nis_print.c (nis_nstype2str): Don't mark names of
	naming services for translation, only UNKNOWN needs it.
	Add comment to prevent it for the future.

2001-05-25  Joseph S. Myers  <jsm28@cam.ac.uk>

	* misc/sys/cdefs.h (__restrict_arr): Define appropriately for GCC
	3.1 and non-GCC C99 compilers.

12 files changed, 96 insertions, 49 deletions

diff --git a/ChangeLog b/ChangeLog
index d7a1a9d887..a7b10a07b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2001-05-25  Bruce Mitchener  <bruce@cubik.org>
+
+	* manual/ctype.texi: Minor fix.
+	* manual/install.texi: Likewise.
+	* manual/startup.texi: Likewise.
+	* manual/examples/dir.c: Use perror() rather than puts().
+
+2001-05-25  David Mosberger  <davidm@hpl.hp.com>
+
+	* sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h: Put stuff following
+	#endif directive inside a comment to avoid compiler warnings.
+
+2001-05-25  Philipp Thomas  <pthomas@suse.de>
+
+	* nis/nis_print.c (nis_nstype2str): Don't mark names of
+	naming services for translation, only UNKNOWN needs it.
+	Add comment to prevent it for the future.
+
+2001-05-25  Joseph S. Myers  <jsm28@cam.ac.uk>
+
+	* misc/sys/cdefs.h (__restrict_arr): Define appropriately for GCC
+	3.1 and non-GCC C99 compilers.
+
 2001-05-22  David Mosberger  <davidm@hpl.hp.com>
 
 	* sysdeps/ia64/memmove.S: Increase MEMLAT from 6 to 21 for better
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index b9d592c22a..7dd7b54fa9 100644
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-25  Bruce Mitchener  <bruce@cubik.org>
+
+	* linuxthreads.texi: Spelling corrections.
+
 2001-05-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* oldsemaphore.c (__old_sem_wait): Clear p_nextwaiting before
diff --git a/linuxthreads/linuxthreads.texi b/linuxthreads/linuxthreads.texi
index 1f2d1a2fac..9513a67a6a 100644
--- a/linuxthreads/linuxthreads.texi
+++ b/linuxthreads/linuxthreads.texi
@@ -19,7 +19,7 @@ use @var{errno}.
 * Thread Attributes::           Tuning thread scheduling.
 * Cancellation::                Stopping a thread before it's done.
 * Cleanup Handlers::            Deallocating resources when a thread is
-                                  cancelled.
+                                  canceled.
 * Mutexes::                     One way to synchronize threads.
 * Condition Variables::         Another way.
 * POSIX Semaphores::            And a third way.
@@ -102,12 +102,12 @@ returns 0. @xref{Cancellation}, for details.
 @deftypefun int pthread_join (pthread_t @var{th}, void **thread_@var{return})
 @code{pthread_join} suspends the execution of the calling thread until
 the thread identified by @var{th} terminates, either by calling
-@code{pthread_exit} or by being cancelled.
+@code{pthread_exit} or by being canceled.
 
 If @var{thread_return} is not @code{NULL}, the return value of @var{th}
 is stored in the location pointed to by @var{thread_return}.  The return
 value of @var{th} is either the argument it gave to @code{pthread_exit},
-or @code{PTHREAD_CANCELED} if @var{th} was cancelled.
+or @code{PTHREAD_CANCELED} if @var{th} was canceled.
 
 The joined thread @code{th} must be in the joinable state: it must not
 have been detached using @code{pthread_detach} or the
@@ -345,7 +345,7 @@ When a thread eventually honors a cancellation request, it behaves as if
 @code{pthread_exit(PTHREAD_CANCELED)} was called.  All cleanup handlers
 are executed in reverse order, finalization functions for
 thread-specific data are called, and finally the thread stops executing.
-If the cancelled thread was joinable, the return value
+If the canceled thread was joinable, the return value
 @code{PTHREAD_CANCELED} is provided to whichever thread calls
 @var{pthread_join} on it. See @code{pthread_exit} for more information.
 
@@ -428,7 +428,7 @@ stack-like discipline.
 
 The purpose of cleanup handlers is to free the resources that a thread
 may hold at the time it terminates. In particular, if a thread exits or
-is cancelled while it owns a locked mutex, the mutex will remain locked
+is canceled while it owns a locked mutex, the mutex will remain locked
 forever and prevent other threads from executing normally. The best way
 to avoid this is, just before locking the mutex, to install a cleanup
 handler whose effect is to unlock the mutex. Cleanup handlers can be
@@ -899,7 +899,7 @@ nothing.
 @end deftypefun
 
 @code{pthread_cond_wait} and @code{pthread_cond_timedwait} are
-cancellation points. If a thread is cancelled while suspended in one of
+cancellation points. If a thread is canceled while suspended in one of
 these functions, the thread immediately resumes execution, relocks the
 mutex specified by  @var{mutex}, and finally executes the cancellation.
 Consequently, cleanup handlers are assured that @var{mutex} is locked
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index b2e9e59671..da39d7d53e 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-26  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/ro_RO: Correct abday, day, abmon, and mon info.
+	Patch by Ionel Mugurel Ciobīcć <tgakic@bambam.chem.tue.nl>.
+
 2001-05-21  Bruno Haible  <haible@clisp.cons.org>
 
 	* tests-mbwc/dat_mbrlen.c (tst_mbrlen_loc): Use a private mbstate_t
diff --git a/localedata/locales/ro_RO b/localedata/locales/ro_RO
index 54d2c1b00c..6d363abafd 100644
--- a/localedata/locales/ro_RO
+++ b/localedata/locales/ro_RO
@@ -2146,33 +2146,33 @@ grouping                  0;0
 END LC_NUMERIC
 
 LC_TIME
-abday   "<U0044>";"<U004C>";"<U004D><U0041>";"<U004D><U0049>";/
-        "<U004A>";"<U0056>";"<U0053>"
-day     "<U0044><U0055><U004D><U0049><U004E><U0049><U0043><U0102>";/
-        "<U004C><U0055><U004E><U0049>";/
-        "<U004D><U0041><U0052><U0162><U0049>";/
-        "<U004D><U0049><U0045><U0052><U0043><U0055><U0052><U0049>";/
-        "<U004A><U004F><U0049>";/
-        "<U0056><U0049><U004E><U0045><U0052><U0049>";/
-        "<U0053><U00CE><U004D><U0042><U0102><U0054><U0102>"
-abmon   "<U0049><U0041><U004E>";"<U0046><U0045><U0042><U0052>";/
-        "<U004D><U0041><U0052><U0054>";"<U0041><U0050><U0052>";/
-        "<U004D><U0041><U0049>";"<U0049><U0055><U004E>";/
-        "<U0049><U0055><U004C>";"<U0041><U0055><U0047>";/
-        "<U0053><U0045><U0050><U0054>";"<U004F><U0043><U0054>";/
-        "<U004E><U004F><U0056>";"<U0044><U0045><U0043>"
-mon     "<U0049><U0041><U004E><U0055><U0041><U0052><U0049><U0045>";/
-        "<U0046><U0045><U0042><U0052><U0055><U0041><U0052><U0049><U0045>";/
-        "<U004D><U0041><U0052><U0054><U0049><U0045>";/
-        "<U0041><U0050><U0052><U0049><U004C><U0049><U0045>";/
-        "<U004D><U0041><U0049>";/
-        "<U0049><U0055><U004E><U0049><U0045>";/
-        "<U0049><U0055><U004C><U0049><U0045>";/
-        "<U0041><U0055><U0047><U0055><U0053><U0054>";/
-        "<U0053><U0045><U0050><U0054><U0045><U004D><U0042><U0052><U0049><U0045>";/
-        "<U004F><U0043><U0054><U004F><U004D><U0042><U0052><U0049><U0045>";/
-        "<U004E><U004F><U0049><U0045><U004D><U0042><U0052><U0049><U0045>";/
-        "<U0044><U0045><U0043><U0045><U004D><U0042><U0052><U0049><U0045>"
+abday   "<U0044><U0075>";"<U004C><U0075>";"<U004D><U0061>";"<U004D><U0069>";/
+        "<U004A><U006F>";"<U0056><U0069>";"<U0053><U00EE>"
+day     "<U0044><U0075><U006D><U0069><U006E><U0069><U0063><U0102>";/
+        "<U004C><U0075><U006E><U0069>";/
+        "<U004D><U0061><U0072><U021B><U0069>";/
+        "<U004D><U0069><U0065><U0072><U0063><U0075><U0072><U0069>";/
+        "<U004A><U006F><U0069>";/
+        "<U0056><U0069><U006E><U0065><U0072><U0069>";/
+        "<U0053><U00EE><U006D><U0062><U0102><U0074><U0102>"
+abmon   "<U0069><U0061><U006E>";"<U0066><U0065><U0062>";/
+        "<U006D><U0061><U0072>";"<U0061><U0070><U0072>";/
+        "<U006D><U0061><U0069>";"<U0069><U0075><U006E>";/
+        "<U0069><U0075><U006C>";"<U0061><U0075><U0067>";/
+        "<U0073><U0065><U0070>";"<U006F><U0063><U0074>";/
+        "<U006E><U006F><U0076>";"<U0064><U0065><U0063>"
+mon     "<U0049><U0061><U006E><U0075><U0061><U0072><U0069><U0065>";/
+        "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0069><U0065>";/
+        "<U004D><U0061><U0072><U0074><U0069><U0065>";/
+        "<U0041><U0070><U0072><U0069><U006C><U0069><U0065>";/
+        "<U004D><U0061><U0069>";/
+        "<U0049><U0075><U006E><U0069><U0065>";/
+        "<U0049><U0075><U006C><U0069><U0065>";/
+        "<U0041><U0075><U0067><U0075><U0073><U0074>";/
+        "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0072><U0069><U0065>";/
+        "<U004F><U0063><U0074><U006F><U006D><U0062><U0072><U0069><U0065>";/
+        "<U004E><U006F><U0069><U0065><U006D><U0062><U0072><U0069><U0065>";/
+        "<U0044><U0065><U0063><U0065><U006D><U0062><U0072><U0069><U0065>"
 d_t_fmt "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
 d_fmt   "<U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>"
 t_fmt   "<U0025><U0054>"
diff --git a/manual/ctype.texi b/manual/ctype.texi
index 8f07cb454c..593f7f3a0b 100644
--- a/manual/ctype.texi
+++ b/manual/ctype.texi
@@ -679,7 +679,7 @@ already supports generating such locale data files.
 @deftp {Data Type} wctrans_t
 This data type is defined as a scalar type which can hold a value
 representing the locale-dependent character mapping.  There is no way to
-construct such a value apar from using the return value of the
+construct such a value apart from using the return value of the
 @code{wctrans} function.
 
 @pindex wctype.h
diff --git a/manual/examples/dir.c b/manual/examples/dir.c
index b90f72da03..59ec62c84c 100644
--- a/manual/examples/dir.c
+++ b/manual/examples/dir.c
@@ -19,7 +19,7 @@ main (void)
       (void) closedir (dp);
     }
   else
-    puts ("Couldn't open the directory.");
+    perror ("Couldn't open the directory");
 
   return 0;
 }
diff --git a/manual/install.texi b/manual/install.texi
index 6488d8bbda..f6e5685ef5 100644
--- a/manual/install.texi
+++ b/manual/install.texi
@@ -141,7 +141,7 @@ this option if you don't plan to do profiling.
 @item --enable-omitfp
 Use maximum optimization for the normal (static and shared)
 libraries, and compile separate static libraries with debugging
-information and no optimisation.  We recommend against this.  The extra
+information and no optimization.  We recommend against this.  The extra
 optimization doesn't gain you much, it may provoke compiler bugs, and
 you won't be able to trace bugs through the C library.
 
diff --git a/manual/startup.texi b/manual/startup.texi
index 90f6a69ac2..35ddbc4904 100644
--- a/manual/startup.texi
+++ b/manual/startup.texi
@@ -381,7 +381,7 @@ The function return @code{-1} if @var{name} is a null pointer, points to
 an empty string, or points to a string containing a @code{=} character.
 It returns @code{0} if the call succeeded.
 
-This function was originall part of the BSD library but is now part of
+This function was originally part of the BSD library but is now part of
 the Unix standard.  The BSD version had no return value, though.
 @end deftypefun
 
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 0c1d2de45b..ec3b48d212 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -195,8 +195,20 @@
 
 /* ISO C99 also allows to declare arrays as non-overlapping.  The syntax is
      array_name[restrict]
-   But gcc so far does not support this syntax.  We define a separate macro
-   for this which can be enabled if the underlying compiler supports it.  */
-#define __restrict_arr
+   GCC 3.1 supports this.  */
+#if __GNUC_PREREQ (3,1)
+# define __restrict_arr	__restrict
+#else
+# ifdef __GNUC__
+#  define __restrict_arr	/* Not supported in old GCC.  */
+# else
+#  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+#   define __restrict_arr	restrict
+#  else
+/* Some other non-C99 compiler.  */
+#   define __restrict_arr	/* Not supported.  */
+#  endif
+# endif
+#endif
 
 #endif	 /* sys/cdefs.h */
diff --git a/nis/nis_print.c b/nis/nis_print.c
index ab5f6838bd..467ae6b9db 100644
--- a/nis/nis_print.c
+++ b/nis/nis_print.c
@@ -26,24 +26,27 @@
 static const char *
 nis_nstype2str (const nstype type)
 {
+
+/* Name service names mustn't be translated, only UNKNOWN needs it */
+
   switch (type)
     {
     case NIS:
-      return N_("NIS");
+      return "NIS";
     case SUNYP:
-      return N_("SUNYP");
+      return "SUNYP";
     case IVY:
-      return N_("IVY");
+      return "IVY";
     case DNS:
-      return N_("DNS");
+      return "DNS";
     case X500:
-      return N_("X500");
+      return "X500";
     case DNANS:
-      return N_("DNANS");
+      return "DNANS";
     case XCHS:
-      return N_("XCHS");
+      return "XCHS";
     case CDS:
-      return N_("CDS");
+      return "CDS";
     default:
       return N_("UNKNOWN");
     }
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h b/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
index 7f99d853a8..458ae5491f 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/sigcontext.h
@@ -54,4 +54,4 @@ struct sigcontext
   unsigned long int sc_mask;	/* signal mask to restore after handler returns */
 };
 
-#endif _BITS_SIGCONTEXT_H
+#endif /* _BITS_SIGCONTEXT_H */