This is the mail archive of the libc-hacker@sourceware.org mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[PATCH] glibc comment spelling fixes


Hi!

I ran aspell (well, as it has no --mode=ccomment, I used the ugly little
awk scripts attached below) on comments in libc *.[chS] source comments.
This is what I came up with, though as I'm not a native speaker some of the
changes below might be wrong or at least unnecessary, so if e.g. Roland
could go over the changes, it would be heartily appreciated.
I haven't creates a ChangeLog entry for this yet, as it will depend
on what files really will need changing.

--- libc/math/libm-test.inc.jj	2005-01-08 16:50:22.000000000 +0100
+++ libc/math/libm-test.inc	2005-08-18 13:42:45.000000000 +0200
@@ -22,7 +22,7 @@
    This file is processed by a perl script.  The resulting file has to
    be included by a master file that defines:
 
-   Makros:
+   Macros:
    FUNC(function): converts general function name (like cos) to
    name with correct suffix (e.g. cosl or cosf)
    MATHCONST(x):   like FUNC but for constants (e.g convert 0.0 to 0.0L)
--- libc/math/fenv.h.jj	2001-07-06 06:55:35.000000000 +0200
+++ libc/math/fenv.h	2005-08-18 13:37:43.000000000 +0200
@@ -25,7 +25,7 @@
 
 #include <features.h>
 
-/* Get the architecture dependend definitions.  The following definitions
+/* Get the architecture dependent definitions.  The following definitions
    are expected to be done:
 
    fenv_t	type for object representing an entire floating-point
--- libc/math/bits/mathcalls.h.jj	2004-08-04 14:42:22.000000000 +0200
+++ libc/math/bits/mathcalls.h	2005-08-18 13:37:43.000000000 +0200
@@ -285,7 +285,7 @@ __MATHCALLX (nextafter,, (_Mdouble_ __x,
 __MATHCALLX (nexttoward,, (_Mdouble_ __x, long double __y), (__const__));
 # endif
 
-/* Return the remainder of integer divison X / Y with infinite precision.  */
+/* Return the remainder of integer division X / Y with infinite precision.  */
 __MATHCALL (remainder,, (_Mdouble_ __x, _Mdouble_ __y));
 
 # if defined __USE_MISC || defined __USE_ISOC99
--- libc/math/tgmath.h.jj	2004-05-07 14:32:16.000000000 +0200
+++ libc/math/tgmath.h	2005-08-18 13:37:43.000000000 +0200
@@ -354,7 +354,7 @@
 /* Floating-point modulo remainder of X/Y.  */
 #define fmod(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, fmod)
 
-/* Round X to integral valuein floating-point format using current
+/* Round X to integral value in floating-point format using current
    rounding direction, but do not raise inexact exception.  */
 #define nearbyint(Val) __TGMATH_UNARY_REAL_ONLY (Val, nearbyint)
 
@@ -402,7 +402,7 @@
 #define nexttoward(Val1, Val2) \
      __TGMATH_BINARY_FIRST_REAL_ONLY (Val1, Val2, nexttoward)
 
-/* Return the remainder of integer divison X / Y with infinite precision.  */
+/* Return the remainder of integer division X / Y with infinite precision.  */
 #define remainder(Val1, Val2) __TGMATH_BINARY_REAL_ONLY (Val1, Val2, remainder)
 
 /* Return X times (2 to the Nth power).  */
--- libc/nptl_db/thread_dbP.h.jj	2004-05-07 14:32:23.000000000 +0200
+++ libc/nptl_db/thread_dbP.h	2005-08-18 13:37:43.000000000 +0200
@@ -30,7 +30,7 @@
 #include "thread_db.h"
 #include "../nptl/pthreadP.h"  	/* This is for *_BITMASK only.  */
 
-/* Indeces for the symbol names.  */
+/* Indices for the symbol names.  */
 enum
   {
 # define DB_STRUCT(type)		SYM_SIZEOF_##type,
--- libc/nptl_db/td_thr_get_info.c.jj	2003-09-09 08:59:59.000000000 +0200
+++ libc/nptl_db/td_thr_get_info.c	2005-08-18 13:37:43.000000000 +0200
@@ -64,7 +64,7 @@ td_thr_get_info (const td_thrhandle_t *t
   if (err != TD_OK)
     return err;
 
-  /* Fill in information.  Clear first to provide reproducable
+  /* Fill in information.  Clear first to provide reproducible
      results for the fields we do not fill in.  */
   memset (infop, '\0', sizeof (td_thrinfo_t));
 
--- libc/nptl_db/thread_db.h.jj	2003-09-09 08:58:19.000000000 +0200
+++ libc/nptl_db/thread_db.h	2005-08-18 13:37:43.000000000 +0200
@@ -21,7 +21,7 @@
 #define _THREAD_DB_H	1
 
 /* This is the debugger interface for the NPTL library.  It is
-   modelled closely after the interface with same names in Solaris
+   modeled closely after the interface with same names in Solaris
    with the goal to share the same code in the debugger.  */
 #include <pthread.h>
 #include <stdint.h>
--- libc/nptl_db/td_thr_tsd.c.jj	2003-09-09 08:57:51.000000000 +0200
+++ libc/nptl_db/td_thr_tsd.c	2005-08-18 13:37:43.000000000 +0200
@@ -48,7 +48,7 @@ td_thr_tsd (const td_thrhandle_t *th, co
   if (err != TD_OK)
     return err;
 
-  /* Compute the indeces.  */
+  /* Compute the indices.  */
   pthread_key_2ndlevel_size
     = DB_DESC_NELEM (th->th_ta_p->ta_field_pthread_key_data_level2_data);
   idx1st = tk / pthread_key_2ndlevel_size;
--- libc/posix/tst-spawn.c.jj	2001-07-06 06:55:38.000000000 +0200
+++ libc/posix/tst-spawn.c	2005-08-18 13:37:44.000000000 +0200
@@ -181,7 +181,7 @@ do_test (int argc, char *argv[])
        + file descriptor number which is supposed to be closed
        + the open file descriptor
        + the newly opened file descriptor
-       + thhe duped second descriptor
+       + the duped second descriptor
        + the name of the closed descriptor
   */
   if (argc != (restart ? 6 : 5))
--- libc/posix/fnmatch.c.jj	2005-04-13 21:29:18.000000000 +0200
+++ libc/posix/fnmatch.c	2005-08-18 13:37:44.000000000 +0200
@@ -41,7 +41,7 @@
 # include <stdlib.h>
 #endif
 
-/* For platform which support the ISO C amendement 1 functionality we
+/* For platform which support the ISO C amendment 1 functionality we
    support user defined character classes.  */
 #if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>.  */
@@ -111,7 +111,7 @@ extern int fnmatch (const char *pattern,
 
 # if defined _LIBC || (defined HAVE_WCTYPE_H && defined HAVE_WCHAR_H)
 /* The GNU C library provides support for user-defined character classes
-   and the functions from ISO C amendement 1.  */
+   and the functions from ISO C amendment 1.  */
 #  ifdef CHARCLASS_NAME_MAX
 #   define CHAR_CLASS_MAX_LENGTH CHARCLASS_NAME_MAX
 #  else
--- libc/posix/regex_internal.h.jj	2005-05-20 10:35:53.000000000 +0200
+++ libc/posix/regex_internal.h	2005-08-18 13:37:44.000000000 +0200
@@ -122,7 +122,7 @@
 extern const char __re_error_msgid[] attribute_hidden;
 extern const size_t __re_error_msgid_idx[] attribute_hidden;
 
-/* Number of bits in an unsinged int.  */
+/* Number of bits in an unsigned int.  */
 #define UINT_BITS (sizeof (unsigned int) * BYTE_BITS)
 /* Number of unsigned int in an bit_set.  */
 #define BITSET_UINTS ((SBC_MAX + UINT_BITS - 1) / UINT_BITS)
--- libc/posix/confstr.c.jj	2004-12-14 10:29:32.000000000 +0100
+++ libc/posix/confstr.c	2005-08-18 13:37:44.000000000 +0200
@@ -48,7 +48,7 @@ confstr (name, buf, len)
 
     case _CS_V6_WIDTH_RESTRICTED_ENVS:
       /* We have to return a newline-separated list of named of
-	 programming environements in which the widths of blksize_t,
+	 programming environments in which the widths of blksize_t,
 	 cc_t, mode_t, nfds_t, pid_t, ptrdiff_t, size_t, speed_t,
 	 ssize_t, suseconds_t, tcflag_t, useconds_t, wchar_t, and
 	 wint_t types are no greater than the width of type long.
--- libc/posix/tst-exec.c.jj	2001-07-06 06:55:38.000000000 +0200
+++ libc/posix/tst-exec.c	2005-08-18 13:37:43.000000000 +0200
@@ -135,7 +135,7 @@ do_test (int argc, char *argv[])
      - three parameters left if called through re-execution
        + file descriptor number which is supposed to be closed
        + the open file descriptor
-       + the name of the closed desriptor
+       + the name of the closed descriptor
   */
 
   if (restart)
--- libc/posix/regcomp.c.jj	2005-07-11 09:51:15.000000000 +0200
+++ libc/posix/regcomp.c	2005-08-18 13:37:44.000000000 +0200
@@ -2110,7 +2110,7 @@ peek_token_bracket (token, input, syntax
 
 /* Entry point of the parser.
    Parse the regular expression REGEXP and return the structure tree.
-   If an error is occured, ERR is set by error code, and return NULL.
+   If an error is occurred, ERR is set by error code, and return NULL.
    This function build the following tree, from regular expression <reg_exp>:
 	   CAT
 	   / \
@@ -2652,7 +2652,7 @@ parse_dup_op (elem, regexp, dfa, token, 
      Build the range expression which starts from START_ELEM, and ends
      at END_ELEM.  The result are written to MBCSET and SBCSET.
      RANGE_ALLOC is the allocated size of mbcset->range_starts, and
-     mbcset->range_ends, is a pointer argument sinse we may
+     mbcset->range_ends, is a pointer argument since we may
      update it.  */
 
 static reg_errcode_t
@@ -2816,8 +2816,8 @@ parse_bracket_exp (regexp, dfa, token, s
   const int32_t *symb_table;
   const unsigned char *extra;
 
-  /* Local function for parse_bracket_exp used in _LIBC environement.
-     Seek the collating symbol entry correspondings to NAME.
+  /* Local function for parse_bracket_exp used in _LIBC environment.
+     Seek the collating symbol entry corresponding to NAME.
      Return the index of the symbol in the SYMB_TABLE.  */
 
   auto inline int32_t
@@ -2849,7 +2849,7 @@ parse_bracket_exp (regexp, dfa, token, s
       return elem;
     }
 
-  /* Local function for parse_bracket_exp used in _LIBC environement.
+  /* Local function for parse_bracket_exp used in _LIBC environment.
      Look up the collation sequence value of BR_ELEM.
      Return the value if succeeded, UINT_MAX otherwise.  */
 
@@ -2914,11 +2914,11 @@ parse_bracket_exp (regexp, dfa, token, s
       return UINT_MAX;
     }
 
-  /* Local function for parse_bracket_exp used in _LIBC environement.
+  /* Local function for parse_bracket_exp used in _LIBC environment.
      Build the range expression which starts from START_ELEM, and ends
      at END_ELEM.  The result are written to MBCSET and SBCSET.
      RANGE_ALLOC is the allocated size of mbcset->range_starts, and
-     mbcset->range_ends, is a pointer argument sinse we may
+     mbcset->range_ends, is a pointer argument since we may
      update it.  */
 
   auto inline reg_errcode_t
@@ -2998,11 +2998,11 @@ parse_bracket_exp (regexp, dfa, token, s
       return REG_NOERROR;
     }
 
-  /* Local function for parse_bracket_exp used in _LIBC environement.
+  /* Local function for parse_bracket_exp used in _LIBC environment.
      Build the collating element which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      COLL_SYM_ALLOC is the allocated size of mbcset->coll_sym, is a
-     pointer argument sinse we may update it.  */
+     pointer argument since we may update it.  */
 
   auto inline reg_errcode_t
   __attribute ((always_inline))
@@ -3449,7 +3449,7 @@ parse_bracket_symbol (elem, regexp, toke
      Build the equivalence class which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      EQUIV_CLASS_ALLOC is the allocated size of mbcset->equiv_classes,
-     is a pointer argument sinse we may update it.  */
+     is a pointer argument since we may update it.  */
 
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N
@@ -3488,7 +3488,7 @@ build_equiv_class (sbcset, name)
 	/* This isn't a valid character.  */
 	return REG_ECOLLATE;
 
-      /* Build single byte matcing table for this equivalence class.  */
+      /* Build single byte matching table for this equivalence class.  */
       char_buf[1] = (unsigned char) '\0';
       len = weights[idx1];
       for (ch = 0; ch < SBC_MAX; ++ch)
@@ -3544,7 +3544,7 @@ build_equiv_class (sbcset, name)
      Build the character class which is represented by NAME.
      The result are written to MBCSET and SBCSET.
      CHAR_CLASS_ALLOC is the allocated size of mbcset->char_classes,
-     is a pointer argument sinse we may update it.  */
+     is a pointer argument since we may update it.  */
 
 static reg_errcode_t
 #ifdef RE_ENABLE_I18N
@@ -3744,7 +3744,7 @@ build_charclass_op (dfa, trans, class_na
 /* This is intended for the expressions like "a{1,3}".
    Fetch a number from `input', and return the number.
    Return -1, if the number field is empty like "{,1}".
-   Return -2, If an error is occured.  */
+   Return -2, If an error is occurred.  */
 
 static int
 fetch_number (input, token, syntax)
--- libc/posix/fnmatch_loop.c.jj	2004-12-06 12:40:56.000000000 +0100
+++ libc/posix/fnmatch_loop.c	2005-08-18 13:37:43.000000000 +0200
@@ -389,7 +389,7 @@ FCT (pattern, string, string_end, no_lea
 			  {
 			    /* We found a table entry.  Now see whether the
 			       character we are currently at has the same
-			       equivalance class value.  */
+			       equivalence class value.  */
 			    int len = weights[idx];
 			    int32_t idx2;
 			    const UCHAR *np = (const UCHAR *) n;
--- libc/posix/regexec.c.jj	2005-05-20 10:49:34.000000000 +0200
+++ libc/posix/regexec.c	2005-08-18 13:37:44.000000000 +0200
@@ -287,7 +287,7 @@ compat_symbol (libc, __compat_regexec, r
    concerned.
 
    If REGS is not NULL, and BUFP->no_sub is not set, the offsets of the match
-   and all groups is stroed in REGS.  (For the "_2" variants, the offsets are
+   and all groups is stored in REGS.  (For the "_2" variants, the offsets are
    computed relative to the concatenation, not relative to the individual
    strings.)
 
@@ -456,7 +456,7 @@ re_search_stub (bufp, string, length, st
 
   rval = 0;
 
-  /* I hope we needn't fill ther regs with -1's when no match was found.  */
+  /* I hope we needn't fill their regs with -1's when no match was found.  */
   if (result != REG_NOERROR)
     rval = -1;
   else if (regs != NULL)
@@ -597,7 +597,7 @@ re_exec (s)
 
 /* Searches for a compiled pattern PREG in the string STRING, whose
    length is LENGTH.  NMATCH, PMATCH, and EFLAGS have the same
-   mingings with regexec.  START, and RANGE have the same meanings
+   meanings with regexec.  START, and RANGE have the same meanings
    with re_search.
    Return REG_NOERROR if we find a match, and REG_NOMATCH if not,
    otherwise return the error code.
@@ -1049,7 +1049,7 @@ acquire_init_state_context (err, mctx, i
    FL_LONGEST_MATCH means we want the POSIX longest matching.
    If P_MATCH_FIRST is not NULL, and the match fails, it is set to the
    next place where we may want to try matching.
-   Note that the matcher assume that the maching starts from the current
+   Note that the matcher assume that the matching starts from the current
    index of the buffer.  */
 
 static int
@@ -2212,7 +2212,7 @@ sift_states_iter_mb (mctx, sctx, node_id
 			    dfa->nexts[node_idx]))
     /* The node can't accept the `multi byte', or the
        destination was already thrown away, then the node
-       could't accept the current input `multi byte'.   */
+       couldn't accept the current input `multi byte'.   */
     naccepted = 0;
   /* Otherwise, it is sure that the node could accept
      `naccepted' bytes input.  */
@@ -2397,7 +2397,7 @@ find_recover_state (err, mctx)
 /* From the node set CUR_NODES, pick up the nodes whose types are
    OP_OPEN_SUBEXP and which have corresponding back references in the regular
    expression. And register them to use them later for evaluating the
-   correspoding back references.  */
+   corresponding back references.  */
 
 static reg_errcode_t
 check_subexp_matching_top (mctx, cur_nodes, str_idx)
@@ -3325,7 +3325,7 @@ build_trtable (dfa, state)
     }
   dests_ch = (bitset *) (dests_node + SBC_MAX);
 
-  /* Initialize transiton table.  */
+  /* Initialize transition table.  */
   state->word_trtable = state->trtable = NULL;
 
   /* At first, group all nodes belonging to `state' into several
@@ -4067,7 +4067,7 @@ extend_buffers (mctx)
   reg_errcode_t ret;
   re_string_t *pstr = &mctx->input;
 
-  /* Double the lengthes of the buffers.  */
+  /* Double the lengths of the buffers.  */
   ret = re_string_realloc_buffers (pstr, pstr->bufs_len * 2);
   if (BE (ret != REG_NOERROR, 0))
     return ret;
--- libc/posix/regex_internal.c.jj	2005-07-11 09:51:15.000000000 +0200
+++ libc/posix/regex_internal.c	2005-08-18 13:37:44.000000000 +0200
@@ -1199,7 +1199,7 @@ re_node_set_merge (dest, src)
 
 /* Insert the new element ELEM to the re_node_set* SET.
    SET should not already have ELEM.
-   return -1 if an error is occured, return 1 otherwise.  */
+   return -1 if an error is occurred, return 1 otherwise.  */
 
 static int
 re_node_set_insert (set, elem)
@@ -1257,7 +1257,7 @@ re_node_set_insert (set, elem)
 
 /* Insert the new element ELEM to the re_node_set* SET.
    SET should not already have any element greater than or equal to ELEM.
-   Return -1 if an error is occured, return 1 otherwise.  */
+   Return -1 if an error is occurred, return 1 otherwise.  */
 
 static int
 re_node_set_insert_last (set, elem)
@@ -1335,7 +1335,7 @@ re_node_set_remove_at (set, idx)
 
 
 /* Add the token TOKEN to dfa->nodes, and return the index of the token.
-   Or return -1, if an error will be occured.  */
+   Or return -1, if an error will be occurred.  */
 
 static int
 re_dfa_add_node (dfa, token)
@@ -1526,7 +1526,7 @@ register_state (dfa, newstate, hash)
   return REG_NOERROR;
 }
 
-/* Create the new state which is independ of contexts.
+/* Create the new state which is independent of contexts.
    Return the new state if succeeded, otherwise return NULL.  */
 
 static re_dfastate_t *
--- libc/posix/globtest.c.jj	2001-07-06 06:55:38.000000000 +0200
+++ libc/posix/globtest.c	2005-08-18 13:37:44.000000000 +0200
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
   if ((glob_flags & GLOB_DOOFFS) && g.gl_pathv[0] == NULL)
     g.gl_pathv[0] = (char *) "abc";
 
-  /* Print out the names.  Unless otherwise specified, qoute them.  */
+  /* Print out the names.  Unless otherwise specified, quote them.  */
   if (g.gl_pathv)
     {
       for (i = 0; i < g.gl_offs + g.gl_pathc; ++i)
--- libc/malloc/malloc.c.jj	2005-04-13 21:28:37.000000000 +0200
+++ libc/malloc/malloc.c	2005-08-18 13:37:44.000000000 +0200
@@ -311,7 +311,7 @@ extern "C" {
   is fairly extensive, and will slow down execution
   noticeably. Calling malloc_stats or mallinfo with MALLOC_DEBUG set
   will attempt to check every non-mmapped allocated and free chunk in
-  the course of computing the summmaries. (By nature, mmapped regions
+  the course of computing the summaries. (By nature, mmapped regions
   cannot be checked very much automatically.)
 
   Setting MALLOC_DEBUG may also be helpful if you are trying to modify
@@ -799,7 +799,7 @@ extern Void_t*     sbrk();
   there's no compelling reason to bother to do this.)
 
   The main declaration needed is the mallinfo struct that is returned
-  (by-copy) by mallinfo().  The SVID/XPG malloinfo struct contains a
+  (by-copy) by mallinfo().  The SVID/XPG mallinfo struct contains a
   bunch of fields that are not even meaningful in this version of
   malloc.  These fields are are instead filled by mallinfo() with
   other numbers that might be of interest.
@@ -831,7 +831,7 @@ extern Void_t*     sbrk();
   if no space is available. Additionally, on failure, errno is
   set to ENOMEM on ANSI C systems.
 
-  If n is zero, malloc returns a minumum-sized chunk. (The minimum
+  If n is zero, malloc returns a minimum-sized chunk. (The minimum
   size is 16 bytes on most 32bit systems, and 24 or 32 bytes on 64bit
   systems.)  On most systems, size_t is an unsigned type, so calls
   with negative arguments are interpreted as requests for huge amounts
@@ -1180,7 +1180,7 @@ void     public_cFREe();
 
   Malloc_trim returns 1 if it actually released any memory, else 0.
   On systems that do not support "negative sbrks", it will always
-  rreturn 0.
+  return 0.
 */
 #if __STD_C
 int      public_mTRIm(size_t);
@@ -1332,7 +1332,7 @@ int      __posix_memalign(void **, size_
   might set to a value close to the average size of a process
   (program) running on your system.  Releasing this much memory
   would allow such a process to run in memory.  Generally, it's
-  worth it to tune for trimming rather tham memory mapping when a
+  worth it to tune for trimming rather than memory mapping when a
   program undergoes phases where several large chunks are
   allocated and released in ways that can reuse each other's
   storage, perhaps mixed with phases where there are no such
@@ -1737,7 +1737,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-
     the malloc code, but "mem" is the pointer that is returned to the
     user.  "Nextchunk" is the beginning of the next contiguous chunk.
 
-    Chunks always begin on even word boundries, so the mem portion
+    Chunks always begin on even word boundaries, so the mem portion
     (which is returned to the user) is also on an even word boundary, and
     thus at least double-word aligned.
 
@@ -1947,7 +1947,7 @@ nextchunk-> +-+-+-+-+-+-+-+-+-+-+-+-+-+-
     and consolidated sets of chunks, which is what these bins hold, so
     they can be found quickly.  All procedures maintain the invariant
     that no consolidated chunk physically borders another one, so each
-    chunk in a list is known to be preceeded and followed by either
+    chunk in a list is known to be preceded and followed by either
     inuse chunks or the ends of memory.
 
     Chunks in bins are kept in size order, with ties going to the
@@ -4190,7 +4190,7 @@ _int_malloc(mstate av, size_t bytes)
 
       We require that av->top always exists (i.e., has size >=
       MINSIZE) after initialization, so if it would otherwise be
-      exhuasted by current request, it is replenished. (The main
+      exhausted by current request, it is replenished. (The main
       reason for ensuring it exists is that we may need MINSIZE space
       to put in fenceposts in sysmalloc.)
     */
--- libc/malloc/mcheck.c.jj	2004-09-09 22:35:50.000000000 +0200
+++ libc/malloc/mcheck.c	2005-08-18 13:37:44.000000000 +0200
@@ -62,7 +62,7 @@ static struct hdr *root;
 
 static int mcheck_used;
 
-/* Nonzero if pedentic checking of all blocks is requested.  */
+/* Nonzero if pedantic checking of all blocks is requested.  */
 static int pedantic;
 
 #if defined _LIBC || defined STDC_HEADERS || defined USG
--- libc/malloc/memusage.c.jj	2004-08-14 18:18:33.000000000 +0200
+++ libc/malloc/memusage.c	2005-08-18 13:37:44.000000000 +0200
@@ -523,7 +523,7 @@ free (void *ptr)
 }
 
 
-/* `mmap' replacement.  We do not have to keep track of the sizesince
+/* `mmap' replacement.  We do not have to keep track of the size since
    `munmap' will get it as a parameter.  */
 void *
 mmap (void *start, size_t len, int prot, int flags, int fd, off_t offset)
@@ -575,7 +575,7 @@ mmap (void *start, size_t len, int prot,
 }
 
 
-/* `mmap' replacement.  We do not have to keep track of the sizesince
+/* `mmap' replacement.  We do not have to keep track of the size since
    `munmap' will get it as a parameter.  */
 void *
 mmap64 (void *start, size_t len, int prot, int flags, int fd, off64_t offset)
@@ -627,7 +627,7 @@ mmap64 (void *start, size_t len, int pro
 }
 
 
-/* `mmap' replacement.  We do not have to keep track of the sizesince
+/* `mmap' replacement.  We do not have to keep track of the size since
    `munmap' will get it as a parameter.  */
 void *
 mremap (void *start, size_t old_len, size_t len, int flags)
@@ -802,7 +802,7 @@ dest (void)
 	     calls[idx_munmap], total[idx_munmap],
 	     failed[idx_munmap] ? "\e[01;41m" : "", failed[idx_munmap]);
 
-  /* Write out a histoogram of the sizes of the allocations.  */
+  /* Write out a histogram of the sizes of the allocations.  */
   fprintf (stderr, "\e[01;32mHistogram for block sizes:\e[0;0m\n");
 
   /* Determine the maximum of all calls for each size range.  */
--- libc/streams/stropts.h.jj	2003-04-19 18:48:35.000000000 +0200
+++ libc/streams/stropts.h	2005-08-18 13:37:44.000000000 +0200
@@ -35,7 +35,7 @@ typedef __uid_t uid_t;
 
 typedef __t_uscalar_t t_uscalar_t;
 
-/* Get system specific contants.  */
+/* Get system specific constants.  */
 #include <bits/stropts.h>
 
 
--- libc/dlfcn/dlfcn.h.jj	2004-11-26 10:16:26.000000000 +0100
+++ libc/dlfcn/dlfcn.h	2005-08-18 13:37:44.000000000 +0200
@@ -41,7 +41,7 @@
 # define RTLD_DEFAULT	((void *) 0)
 
 
-/* Type for namespace indeces.  */
+/* Type for namespace indices.  */
 typedef long int Lmid_t;
 
 /* Special namespace ID values.  */
--- libc/dlfcn/dlerror.c.jj	2005-06-22 18:34:11.000000000 +0200
+++ libc/dlfcn/dlerror.c	2005-08-18 13:37:44.000000000 +0200
@@ -191,7 +191,7 @@ check_free (struct dl_action_result *rec
     {
       /* We can free the string only if the allocation happened in the
 	 C library used by the dynamic linker.  This means, it is
-	 always the C library in the base namespave.  */
+	 always the C library in the base namespace.  */
       struct link_map *map = NULL;
       Dl_info info;
       if (_dl_addr (check_free, &info, &map, NULL) != 0
--- libc/inet/netinet/igmp.h.jj	2003-05-15 02:29:21.000000000 +0200
+++ libc/inet/netinet/igmp.h	2005-08-18 13:37:44.000000000 +0200
@@ -110,7 +110,7 @@ struct igmp {
 #define IGMP_v2_ROUTER		2
 
 /*
- * The following four defininitions are for backwards compatibility.
+ * The following four definitions are for backwards compatibility.
  * They should be removed as soon as all applications are updated to
  * use the new constant names.
  */
--- libc/inet/protocols/timed.h.jj	1999-06-08 23:02:54.000000000 +0200
+++ libc/inet/protocols/timed.h	2005-08-18 13:37:44.000000000 +0200
@@ -60,7 +60,7 @@ struct tsp {
  */
 #define	TSP_ANY			0	/* match any types */
 #define	TSP_ADJTIME		1	/* send adjtime */
-#define	TSP_ACK			2	/* generic acknowledgement */
+#define	TSP_ACK			2	/* generic acknowledgment */
 #define	TSP_MASTERREQ		3	/* ask for master's name */
 #define	TSP_MASTERACK		4	/* acknowledge master request */
 #define	TSP_SETTIME		5	/* send network time */
--- libc/inet/rexec.c.jj	2005-02-21 17:19:38.000000000 +0100
+++ libc/inet/rexec.c	2005-08-18 13:37:44.000000000 +0200
@@ -153,7 +153,7 @@ retry:
 	struct iovec iov[3] =
 	  {
 	    [0] = { .iov_base = (void *) name, .iov_len = strlen (name) + 1 },
-	    /* should public key encypt the password here */
+	    /* should public key encrypt the password here */
 	    [1] = { .iov_base = (void *) pass, .iov_len = strlen (pass) + 1 },
 	    [2] = { .iov_base = (void *) cmd, .iov_len = strlen (cmd) + 1 }
 	  };
--- libc/inet/rcmd.c.jj	2005-07-28 15:57:01.000000000 +0200
+++ libc/inet/rcmd.c	2005-08-18 13:37:44.000000000 +0200
@@ -475,7 +475,7 @@ iruserfopen (const char *file, uid_t oku
   FILE *res = NULL;
 
   /* If not a regular file, if owned by someone other than user or
-     root, if writeable by anyone but the owner, or if hardlinked
+     root, if writable by anyone but the owner, or if hardlinked
      anywhere, quit.  */
   cp = NULL;
   if (__lxstat64 (_STAT_VER, file, &st))
--- libc/inet/arpa/inet.h.jj	2004-08-04 14:15:58.000000000 +0200
+++ libc/inet/arpa/inet.h	2005-08-18 13:37:44.000000000 +0200
@@ -46,7 +46,7 @@ extern struct in_addr inet_makeaddr (in_
 extern in_addr_t inet_netof (struct in_addr __in) __THROW;
 
 /* Extract the network number in network byte order from the address
-   in numbers-and-dots natation starting at CP.  */
+   in numbers-and-dots notation starting at CP.  */
 extern in_addr_t inet_network (__const char *__cp) __THROW;
 
 /* Convert Internet number in IN to ASCII representation.  The return value
@@ -61,7 +61,7 @@ extern int inet_pton (int __af, __const 
 
 /* Convert a Internet address in binary network format for interface
    type AF in buffer starting at CP to presentation form and place
-   result in buffer of length LEN astarting at BUF.  */
+   result in buffer of length LEN starting at BUF.  */
 extern __const char *inet_ntop (int __af, __const void *__restrict __cp,
 				char *__restrict __buf, socklen_t __len)
      __THROW;
@@ -78,7 +78,7 @@ extern int inet_aton (__const char *__cp
 extern char *inet_neta (in_addr_t __net, char *__buf, size_t __len) __THROW;
 
 /* Convert network number for interface type AF in buffer starting at
-   CP to presentation format.  The result will specifiy BITS bits of
+   CP to presentation format.  The result will specify BITS bits of
    the number.  */
 extern char *inet_net_ntop (int __af, __const void *__cp, int __bits,
 			    char *__buf, size_t __len) __THROW;
--- libc/inet/arpa/tftp.h.jj	1999-06-11 23:27:12.000000000 +0200
+++ libc/inet/arpa/tftp.h	2005-08-18 13:37:44.000000000 +0200
@@ -43,7 +43,7 @@
 #define	RRQ	01				/* read request */
 #define	WRQ	02				/* write request */
 #define	DATA	03				/* data packet */
-#define	ACK	04				/* acknowledgement */
+#define	ACK	04				/* acknowledgment */
 #define	ERROR	05				/* error code */
 
 struct	tftphdr {
--- libc/nis/nis_ismember.c.jj	2001-07-06 06:55:36.000000000 +0200
+++ libc/nis/nis_ismember.c	2005-08-18 13:37:44.000000000 +0200
@@ -23,7 +23,7 @@
 /* internal_nis_ismember ()
    return codes: -1 principal is in -group
                   0 principal isn't in any group
-		  1 pirncipal is in group */
+		  1 principal is in group */
 static int
 internal_ismember (const_nis_name principal, const_nis_name group)
 {
--- libc/nis/rpcsvc/nis_tags.h.jj	1997-12-28 16:02:26.000000000 +0100
+++ libc/nis/rpcsvc/nis_tags.h	2005-08-18 13:37:44.000000000 +0200
@@ -31,7 +31,7 @@ extern "C" {
 #define	ALL_RESULTS	(1<<3)	/* Retrieve all results 		*/
 #define	NO_CACHE	(1<<4)	/* Do not return 'cached' results 	*/
 #define	MASTER_ONLY	(1<<5)	/* Get value only from master server	*/
-#define	EXPAND_NAME	(1<<6)	/* Expand partitially qualified names	*/
+#define	EXPAND_NAME	(1<<6)	/* Expand partially qualified names	*/
 
 /* Semantic modification for table operations flags */
 #define	RETURN_RESULT	(1<<7)	/* Return resulting object to client    */
--- libc/nis/rpcsvc/nis.h.jj	1999-12-31 19:47:09.000000000 +0100
+++ libc/nis/rpcsvc/nis.h	2005-08-18 13:37:44.000000000 +0200
@@ -469,7 +469,7 @@ typedef struct fd_result fd_result;
 #define NIS_NOBODY(a, m)       (((a) & ((m) << 24)) != 0)
 /*
  * EOL Alert - The following non-prefixed test macros are
- * here for backward compatability, and will be not be present
+ * here for backward compatibility, and will be not be present
  * in future releases - use the NIS_*() macros above.
  */
 #define WORLD(a, m)	(((a) & (m)) != 0)
--- libc/nis/nis_print.c.jj	2004-11-01 13:25:30.000000000 +0100
+++ libc/nis/nis_print.c	2005-08-18 13:37:44.000000000 +0200
@@ -290,7 +290,7 @@ nis_print_link (const link_obj *obj)
   fputs (_("Linked Object Type : "), stdout);
   nis_print_objtype (obj->li_rtype);
   printf (_("Linked to : %s\n"), obj->li_name);
-  /* XXX Print the attributs here, if they exists */
+  /* XXX Print the attributes here, if they exists */
 }
 libnsl_hidden_def (nis_print_link)
 
--- libc/nis/nss_compat/compat-spwd.c.jj	2005-07-11 09:51:13.000000000 +0200
+++ libc/nis/nss_compat/compat-spwd.c	2005-08-18 13:37:44.000000000 +0200
@@ -396,7 +396,7 @@ getspent_next_nss (struct spwd *result, 
   return NSS_STATUS_SUCCESS;
 }
 
-/* This function handle the +user entrys in /etc/shadow */
+/* This function handle the +user entrees in /etc/shadow */
 static enum nss_status
 getspnam_plususer (const char *name, struct spwd *result, ent_t *ent,
 		   char *buffer, size_t buflen, int *errnop)
--- libc/nis/nss_compat/compat-pwd.c.jj	2005-07-11 09:51:13.000000000 +0200
+++ libc/nis/nss_compat/compat-pwd.c	2005-08-18 13:37:44.000000000 +0200
@@ -448,7 +448,7 @@ getpwent_next_nss (struct passwd *result
   return NSS_STATUS_SUCCESS;
 }
 
-/* This function handle the +user entrys in /etc/passwd */
+/* This function handle the +user entries in /etc/passwd */
 static enum nss_status
 getpwnam_plususer (const char *name, struct passwd *result, ent_t *ent,
 		   char *buffer, size_t buflen, int *errnop)
--- libc/nis/nss_compat/compat-grp.c.jj	2005-07-11 09:51:12.000000000 +0200
+++ libc/nis/nss_compat/compat-grp.c	2005-08-18 13:37:44.000000000 +0200
@@ -221,7 +221,7 @@ getgrent_next_nss (struct group *result,
   return NSS_STATUS_SUCCESS;
 }
 
-/* This function handle the +group entrys in /etc/group */
+/* This function handle the +group entries in /etc/group */
 static enum nss_status
 getgrnam_plusgroup (const char *name, struct group *result, ent_t *ent,
 		    char *buffer, size_t buflen, int *errnop)
--- libc/nis/ypclnt.c.jj	2005-04-13 21:28:39.000000000 +0200
+++ libc/nis/ypclnt.c	2005-08-18 13:37:44.000000000 +0200
@@ -672,7 +672,7 @@ __xdr_ypresp_all (XDR *xdrs, struct ypre
 	  objp->status = resp.ypresp_all_u.val.stat;
 	  xdr_free ((xdrproc_t) xdr_ypresp_all, (char *) &resp);
 	  /* Sun says we don't need to make this call, but must return
-	     immediatly. Since Solaris makes this call, we will call
+	     immediately. Since Solaris makes this call, we will call
 	     the callback function, too. */
 	  (*objp->foreach) (objp->status, NULL, 0, NULL, 0, objp->data);
 	  return TRUE;
--- libc/nis/nis_checkpoint.c.jj	2001-07-06 06:55:36.000000000 +0200
+++ libc/nis/nis_checkpoint.c	2005-08-18 13:37:44.000000000 +0200
@@ -44,7 +44,7 @@ nis_checkpoint(const_nis_name dirname)
 	  return res2;
 	}
 
-      /* Check if obj is really a diryectory object */
+      /* Check if obj is really a directory object */
       if (__type_of (NIS_RES_OBJECT (res2)) != NIS_DIRECTORY_OBJ)
 	{
 	  nis_freeresult (res2);
--- libc/nis/nis_ping.c.jj	2001-07-06 06:55:36.000000000 +0200
+++ libc/nis/nis_ping.c	2005-08-18 13:37:44.000000000 +0200
@@ -48,7 +48,7 @@ nis_ping (const_nis_name dirname, unsign
   else
     obj = (nis_object *) dirobj;
 
-  /* Check if obj is really a diryectory object */
+  /* Check if obj is really a directory object */
   if (__type_of (obj) != NIS_DIRECTORY_OBJ)
     {
       if (res != NULL)
--- libc/iconvdata/iso-2022-jp-3.c.jj	2004-08-04 14:15:56.000000000 +0200
+++ libc/iconvdata/iso-2022-jp-3.c	2005-08-18 13:37:45.000000000 +0200
@@ -135,7 +135,7 @@ enum
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)								      \
     saved_state = *statep;						      \
--- libc/iconvdata/jis0208.h.jj	2005-02-08 17:17:04.000000000 +0100
+++ libc/iconvdata/jis0208.h	2005-08-18 13:37:45.000000000 +0200
@@ -24,7 +24,7 @@
 #include <gconv.h>
 #include <stdint.h>
 
-/* Struct for table with indeces in UCS mapping table.  */
+/* Struct for table with indices in UCS mapping table.  */
 struct jisx0208_ucs_idx
 {
   uint16_t start;
--- libc/iconvdata/iso646.c.jj	2002-06-28 23:13:14.000000000 +0200
+++ libc/iconvdata/iso646.c	2005-08-18 13:37:45.000000000 +0200
@@ -20,7 +20,7 @@
 
 /* The implementation of the conversion which can be performed by this
    module are not very sophisticated and not tuned at all.  There are
-   zillions of ISO 646 derivates and supporting them all in a separate
+   zillions of ISO 646 derivatives and supporting them all in a separate
    module is overkill since these coded character sets are hardly ever
    used anymore (except ANSI_X3.4-1968 == ASCII, which is compatible
    with ISO 8859-1).  The European variants are superceded by the
--- libc/iconvdata/gbbig5.c.jj	2002-12-02 23:33:55.000000000 +0100
+++ libc/iconvdata/gbbig5.c	2005-08-18 13:37:45.000000000 +0200
@@ -23,7 +23,7 @@
 #include <stdint.h>
 
 /*
- * This module does convertions between gb2312 and big5 encodings.
+ * This module does conversions between gb2312 and big5 encodings.
  * It is necessary because gb2312 encoding use simplified chinese,
  * while big5 use traditional one. Often times both the simplified
  * version of a chinese character and its traditional counterpart
--- libc/iconvdata/ibm937.c.jj	2002-06-28 23:21:25.000000000 +0200
+++ libc/iconvdata/ibm937.c	2005-08-18 13:37:45.000000000 +0200
@@ -76,7 +76,7 @@
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)								      \
     save_curcs = *curcsp;						      \
--- libc/iconvdata/ibm935.c.jj	2002-06-28 23:21:25.000000000 +0200
+++ libc/iconvdata/ibm935.c	2005-08-18 13:37:45.000000000 +0200
@@ -76,7 +76,7 @@
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)								      \
     save_curcs = *curcsp;						      \
--- libc/iconvdata/iso-2022-jp.c.jj	2002-06-28 23:13:11.000000000 +0200
+++ libc/iconvdata/iso-2022-jp.c	2005-08-18 13:37:45.000000000 +0200
@@ -250,7 +250,7 @@ gconv_end (struct __gconv_step *data)
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)								      \
     save_set = *setp;							      \
@@ -272,7 +272,7 @@ gconv_end (struct __gconv_step *data)
     if (__builtin_expect (ch, 0) == ESC)				      \
       {									      \
 	/* We now must be prepared to read two to three more		      \
-	   chracters.  If we have a match in the first character but	      \
+	   characters.  If we have a match in the first character but	      \
 	   then the input buffer ends we terminate with an error since	      \
 	   we must not risk missing an escape sequence just because it	      \
 	   is not entirely in the current input buffer.  */		      \
@@ -680,7 +680,7 @@ static const cvlist_t conversion_lists[4
 	   the character is unknown.					      \
 	   The CJK character sets partially overlap when seen as subsets      \
 	   of ISO 10646; therefore there is no single correct result.	      \
-	   We use a preferrence order which depends on the language tag.  */  \
+	   We use a preference order which depends on the language tag.  */  \
 									      \
 	if (ch <= 0x7f)							      \
 	  {								      \
--- libc/iconvdata/ibm930.c.jj	2002-06-28 23:19:37.000000000 +0200
+++ libc/iconvdata/ibm930.c	2005-08-18 13:37:45.000000000 +0200
@@ -76,7 +76,7 @@
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)								      \
     save_curcs = *curcsp;						      \
@@ -84,7 +84,7 @@
     *curcsp = save_curcs
 
 
-/* Current codeset type.  */
+/* Current code set type.  */
 enum
 {
   sb = 0,
--- libc/iconvdata/ibm933.c.jj	2002-06-28 23:20:20.000000000 +0200
+++ libc/iconvdata/ibm933.c	2005-08-18 13:37:45.000000000 +0200
@@ -76,7 +76,7 @@
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)								      \
     save_curcs = *curcsp;						      \
--- libc/iconvdata/jis0208.c.jj	2002-12-17 02:29:56.000000000 +0100
+++ libc/iconvdata/jis0208.c	2005-08-18 13:37:45.000000000 +0200
@@ -1860,7 +1860,7 @@ const char __jisx0208_from_ucs4_greek[0x
 /* The mapping of all the other UCS values is quite difficult since they
    are distributed from 0x2010 upto to 0xffe5.  There are many gaps with
    unpredictable place and size.  Therefore we use a table which maps
-   ranges to idexes in a table.  This table ca be generated with:
+   ranges to indexes in a table.  This table ca be generated with:
 
    egrep '^0x' < .../eastasia/jis/jis0208.txt | awk '{ print $3, $2}' |
    egrep '^0x[^01]' | sort -u | perl tab.pl
--- libc/iconvdata/jis0212.h.jj	2003-06-11 23:40:42.000000000 +0200
+++ libc/iconvdata/jis0212.h	2005-08-18 13:37:45.000000000 +0200
@@ -25,7 +25,7 @@
 #include <stdint.h>
 
 
-/* Struct for table with indeces in mapping table.  */
+/* Struct for table with indices in mapping table.  */
 struct jisx0212_idx
 {
   uint16_t start;
--- libc/iconvdata/iso-2022-cn-ext.c.jj	2004-03-08 12:01:44.000000000 +0100
+++ libc/iconvdata/iso-2022-cn-ext.c	2005-08-18 13:37:45.000000000 +0200
@@ -154,7 +154,7 @@ enum
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)								      \
     save_set = *setp;							      \
--- libc/iconvdata/gbgbk.c.jj	2002-06-28 23:22:19.000000000 +0200
+++ libc/iconvdata/gbgbk.c	2005-08-18 13:37:45.000000000 +0200
@@ -63,7 +63,7 @@
 	     0xA8BB to 0xA8C0						      \
 									      \
 	   All these characters are not defined in GB2312.  Besides this      \
-	   there is an incomatibility in the mapping.  The Unicode tables     \
+	   there is an incompatibility in the mapping.  The Unicode tables     \
 	   say that 0xA1A4 maps in GB2312 to U30FB while in GBK it maps to    \
 	   U00B7.  Similarly, 0xA1AA maps in GB2312 to U2015 while in GBK     \
 	   it maps to U2014.  Since we are free to do whatever we want if     \
--- libc/iconvdata/iso-2022-cn.c.jj	2002-06-28 23:13:14.000000000 +0200
+++ libc/iconvdata/iso-2022-cn.c	2005-08-18 13:37:45.000000000 +0200
@@ -103,7 +103,7 @@ enum
 
 
 /* Since we might have to reset input pointer we must be able to save
-   and retore the state.  */
+   and restore the state.  */
 #define SAVE_RESET_STATE(Save) \
   if (Save)								      \
     save_set = *setp;							      \
--- libc/stdlib/tst-strtod.c.jj	2004-08-04 14:16:17.000000000 +0200
+++ libc/stdlib/tst-strtod.c	2005-08-18 13:37:45.000000000 +0200
@@ -252,7 +252,7 @@ locale_test (void)
 	  continue;
 	}
 
-      /* We call __strtod_interal here instead of strtod to tests the
+      /* We call __strtod_internal here instead of strtod to tests the
 	 handling of grouping.  */
       d = __strtod_internal (tests[n].str, &endp, 1);
       if (d != tests[n].exp)
--- libc/stdlib/tst-random.c.jj	2001-08-24 00:35:09.000000000 +0200
+++ libc/stdlib/tst-random.c	2005-08-18 13:37:45.000000000 +0200
@@ -8,14 +8,14 @@
    is regenerated twice and checked against the stored values.
 
    First they are regenerated one sequence at a time, using srandom()
-   to set the initial state.  A discrepency here would suggest that
+   to set the initial state.  A discrepancy here would suggest that
    srandom() was failing to completely initialize the random number
    generator.
 
    Second the sequences are regenerated in an interleaved order.
    A state vector is created for each sequence using initstate().
    setstate() is used to switch from sequence to sequence during
-   the interleaved generation.  A discrepency here would suggest
+   the interleaved generation.  A discrepancy here would suggest
    a problem with either initstate() failing to initialize the
    random number generator properly, or the failure of setstate()
    to correctly save and restore state information.  Also, each
--- libc/catgets/gencat.c.jj	2005-01-19 14:12:33.000000000 +0100
+++ libc/catgets/gencat.c	2005-08-18 13:37:45.000000000 +0200
@@ -420,7 +420,7 @@ read_input_file (struct catalog *current
 		    }
 		  else
 		    {
-		      /* We have found seomthing that looks like a
+		      /* We have found something that looks like a
 			 correct identifier.  */
 		      struct set_list *runp;
 
--- libc/nscd/initgrcache.c.jj	2005-02-25 14:54:25.000000000 +0100
+++ libc/nscd/initgrcache.c	2005-08-18 13:37:45.000000000 +0200
@@ -97,7 +97,7 @@ addinitgroupsX (struct database_dyn *db,
 
   long int size;
   if (limit > 0)
-    /* We limit the size of the intially allocated array.  */
+    /* We limit the size of the initially allocated array.  */
     size = MIN (limit, 64);
   else
     /* No fixed limit on groups.  Pick a starting buffer size.  */
@@ -242,7 +242,7 @@ addinitgroupsX (struct database_dyn *db,
 
       written = total = sizeof (struct dataset) + start * sizeof (int32_t);
 
-      /* If we refill the cache, first assume the reconrd did not
+      /* If we refill the cache, first assume the record did not
 	 change.  Allocate memory on the cache since it is likely
 	 discarded anyway.  If it turns out to be necessary to have a
 	 new record we can still allocate real memory.  */
--- libc/nscd/hstcache.c.jj	2005-02-25 14:54:25.000000000 +0100
+++ libc/nscd/hstcache.c	2005-08-18 13:37:45.000000000 +0200
@@ -206,7 +206,7 @@ cache_addhst (struct database_dyn *db, i
 		+ h_addr_list_cnt * hst->h_length);
       written = total;
 
-      /* If we refill the cache, first assume the reconrd did not
+      /* If we refill the cache, first assume the record did not
 	 change.  Allocate memory on the cache since it is likely
 	 discarded anyway.  If it turns out to be necessary to have a
 	 new record we can still allocate real memory.  */
@@ -357,7 +357,7 @@ cache_addhst (struct database_dyn *db, i
 	  pthread_rwlock_rdlock (&db->lock);
 
 	  /* NB: the following code is really complicated.  It has
-	     seemlingly duplicated code paths which do the same.  The
+	     seemingly duplicated code paths which do the same.  The
 	     problem is that we always must add the hash table entry
 	     with the FIRST flag set first.  Otherwise we get dangling
 	     pointers in case memory allocation fails.  */
--- libc/nscd/grpcache.c.jj	2005-07-20 10:32:47.000000000 +0200
+++ libc/nscd/grpcache.c	2005-08-18 13:37:45.000000000 +0200
@@ -191,7 +191,7 @@ cache_addgr (struct database_dyn *db, in
 			 + gr_mem_cnt * sizeof (uint32_t)
 			 + gr_name_len + gr_passwd_len + gr_mem_len_total);
 
-      /* If we refill the cache, first assume the reconrd did not
+      /* If we refill the cache, first assume the record did not
 	 change.  Allocate memory on the cache since it is likely
 	 discarded anyway.  If it turns out to be necessary to have a
 	 new record we can still allocate real memory.  */
--- libc/nscd/nscd_conf.c.jj	2004-10-05 00:36:50.000000000 +0200
+++ libc/nscd/nscd_conf.c	2005-08-18 13:37:45.000000000 +0200
@@ -274,7 +274,7 @@ nscd_parse_file (const char *fname, stru
     {
       restart_time = time (NULL) + restart_interval;
 
-      /* Save the old current workding directory if we are in paranoia
+      /* Save the old current working directory if we are in paranoia
 	 mode.  We have to change back to it.  */
       oldcwd = get_current_dir_name ();
       if (oldcwd == NULL)
--- libc/nscd/nscd_helper.c.jj	2005-07-20 10:32:47.000000000 +0200
+++ libc/nscd/nscd_helper.c	2005-08-18 13:37:45.000000000 +0200
@@ -166,7 +166,7 @@ wait_on_socket (int sock)
 }
 
 
-/* Try to get a file descriptor for the shared meory segment
+/* Try to get a file descriptor for the shared memory segment
    containing the database.  */
 static struct mapped_database *
 get_mapping (request_type type, const char *key,
--- libc/nscd/nscd.c.jj	2005-07-20 10:32:47.000000000 +0200
+++ libc/nscd/nscd.c	2005-08-18 13:37:45.000000000 +0200
@@ -479,7 +479,7 @@ check_pid (const char *file)
 
       /* If we cannot parse the file default to assuming nscd runs.
 	 If the PID is alive, assume it is running.  That all unless
-	 the PID is the same as the current process' since tha latter
+	 the PID is the same as the current process' since the latter
 	 can mean we re-exec.  */
       if ((n != 1 || kill (pid, 0) == 0) && pid != getpid ())
         return 1;
--- libc/nscd/pwdcache.c.jj	2005-02-25 14:54:25.000000000 +0100
+++ libc/nscd/pwdcache.c	2005-08-18 13:37:45.000000000 +0200
@@ -186,7 +186,7 @@ cache_addpw (struct database_dyn *db, in
       written = total = (sizeof (struct dataset) + pw_name_len + pw_passwd_len
 			 + pw_gecos_len + pw_dir_len + pw_shell_len);
 
-      /* If we refill the cache, first assume the reconrd did not
+      /* If we refill the cache, first assume the record did not
 	 change.  Allocate memory on the cache since it is likely
 	 discarded anyway.  If it turns out to be necessary to have a
 	 new record we can still allocate real memory.  */
--- libc/nscd/nscd_stat.c.jj	2005-08-17 18:03:24.000000000 +0200
+++ libc/nscd/nscd_stat.c	2005-08-18 13:37:45.000000000 +0200
@@ -254,7 +254,7 @@ receive_print_stats (void)
       if (enabled[0] == '\0')
 	/* The locale does not provide this information so we have to
 	   translate it ourself.  Since we should avoid short translation
-	   terms we artifically increase the length.  */
+	   terms we artificially increase the length.  */
 	enabled = data.dbs[i].enabled ? yesstr : nostr;
       if (check_file[0] == '\0')
 	check_file = data.dbs[i].check_file ? yesstr : nostr;
--- libc/nscd/connections.c.jj	2005-08-17 18:08:02.000000000 +0200
+++ libc/nscd/connections.c	2005-08-18 13:37:45.000000000 +0200
@@ -590,7 +590,7 @@ cannot create read-only descriptor for \
 cannot create read-only descriptor for \"%s\"; no mmap"),
 			   dbs[cnt].db_filename);
 
-		/* Before we create the header, initialiye the hash
+		/* Before we create the header, initialize the hash
 		   table.  So that if we get interrupted if writing
 		   the header we can recognize a partially initialized
 		   database.  */
@@ -769,7 +769,7 @@ cannot set socket to close on exec: %s; 
       exit (1);
     }
 
-  /* Change to unprivileged uid/gid/groups if specifed in config file */
+  /* Change to unprivileged uid/gid/groups if specified in config file */
   if (server_user != NULL)
     finish_drop_privileges ();
 }
@@ -1407,7 +1407,7 @@ handle_request: request received (Versio
 	  /* Compute next timeout time.  */
 	  prune_ts.tv_sec += CACHE_PRUNE_INTERVAL;
 
-	  /* In case the list is emtpy we do not want to run the prune
+	  /* In case the list is empty we do not want to run the prune
 	     code right away again.  */
 	  to = 0;
 	}
--- libc/hesiod/hesiod.c.jj	2005-06-22 18:34:13.000000000 +0200
+++ libc/hesiod/hesiod.c	2005-08-18 13:37:45.000000000 +0200
@@ -324,7 +324,7 @@ parse_config_file(struct hesiod_p *ctx, 
 			}
 			if (n == 0) {
 				/* Restore the default.  Better than
-				   nother at all.  */
+				   XXXXXX at all.  */
 				ctx->classes[0] = C_IN;
 				ctx->classes[1] = C_HS;
 			} else if (n == 1
--- libc/elf/ldconfig.c.jj	2005-04-13 21:28:20.000000000 +0200
+++ libc/elf/ldconfig.c	2005-08-18 13:37:45.000000000 +0200
@@ -591,7 +591,7 @@ manual_link (char *library)
    - search for libraries which will be added to the cache
    - create symbolic links to the soname for each library
 
-   This has to be done separatly for each directory.
+   This has to be done separately for each directory.
 
    To keep track of which libraries to add to the cache and which
    links to create, we save a list of all libraries.
--- libc/elf/dl-profile.c.jj	2004-07-12 17:50:22.000000000 +0200
+++ libc/elf/dl-profile.c	2005-08-18 13:37:45.000000000 +0200
@@ -38,7 +38,7 @@
 
 /* The LD_PROFILE feature has to be implemented different to the
    normal profiling using the gmon/ functions.  The problem is that an
-   arbitrary amount of processes simulataneously can be run using
+   arbitrary amount of processes simultaneously can be run using
    profiling and all write the results in the same file.  To provide
    this mechanism one could implement a complicated mechanism to merge
    the content of two profiling runs or one could extend the file
@@ -101,7 +101,7 @@
 	0038+(2*CN+2)*A+(CN-1)*4+K	?? ?? ?? ??	<- Count#CGN
 
    We put (for now?) no basic block information in the file since this would
-   introduce rase conditions among all the processes who want to write them.
+   introduce race conditions among all the processes who want to write them.
 
    `K' is the number of count entries which is computed as
 
@@ -166,7 +166,7 @@ static unsigned int log_hashfraction;
 
 
 
-/* Set up profiling data to profile object desribed by MAP.  The output
+/* Set up profiling data to profile object described by MAP.  The output
    file is found (or created) in OUTPUT_DIR.  */
 void
 internal_function
--- libc/elf/elf.h.jj	2005-08-08 09:14:45.000000000 +0200
+++ libc/elf/elf.h	2005-08-18 13:37:46.000000000 +0200
@@ -327,7 +327,7 @@ typedef struct
 #define SHT_FINI_ARRAY	  15		/* Array of destructors */
 #define SHT_PREINIT_ARRAY 16		/* Array of pre-constructors */
 #define SHT_GROUP	  17		/* Section group */
-#define SHT_SYMTAB_SHNDX  18		/* Extended section indeces */
+#define SHT_SYMTAB_SHNDX  18		/* Extended section indices */
 #define	SHT_NUM		  19		/* Number of defined types.  */
 #define SHT_LOOS	  0x60000000	/* Start OS-specific */
 #define SHT_GNU_LIBLIST	  0x6ffffff7	/* Prelink library list */
@@ -1202,7 +1202,7 @@ typedef struct
 #define R_SPARC_LM22		36	/* Low middle 22 bits of ... */
 #define R_SPARC_PC_HH22		37	/* Top 22 bits of pc rel 64 bit */
 #define R_SPARC_PC_HM10		38	/* High middle 10 bit of ... */
-#define R_SPARC_PC_LM22		39	/* Low miggle 22 bits of ... */
+#define R_SPARC_PC_LM22		39	/* Low middle 22 bits of ... */
 #define R_SPARC_WDISP16		40	/* PC relative 16 bit shifted */
 #define R_SPARC_WDISP19		41	/* PC relative 19 bit shifted */
 #define R_SPARC_7		43	/* Direct 7 bit */
@@ -1649,9 +1649,9 @@ typedef Elf32_Addr Elf32_Conflict;
 #define EFA_PARISC_1_1		    0x0210 /* PA-RISC 1.1 big-endian.  */
 #define EFA_PARISC_2_0		    0x0214 /* PA-RISC 2.0 big-endian.  */
 
-/* Additional section indeces.  */
+/* Additional section indices.  */
 
-#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tenatively declared
+#define SHN_PARISC_ANSI_COMMON	0xff00	   /* Section for tentatively declared
 					      symbols in ANSI C.  */
 #define SHN_PARISC_HUGE_COMMON	0xff01	   /* Common blocks in huge model.  */
 
@@ -1808,7 +1808,7 @@ typedef Elf32_Addr Elf32_Conflict;
 
 /* Legal values for sh_type field of Elf64_Shdr.  */
 
-/* These two are primerily concerned with ECOFF debugging info.  */
+/* These two are primarily concerned with ECOFF debugging info.  */
 #define SHT_ALPHA_DEBUG		0x70000001
 #define SHT_ALPHA_REGINFO	0x70000002
 
--- libc/elf/reldep.c.jj	2000-08-27 01:36:55.000000000 +0200
+++ libc/elf/reldep.c	2005-08-18 13:37:45.000000000 +0200
@@ -93,7 +93,7 @@ main (void)
       exit (1);
     }
 
-  /* The variable now must have its originial value.  */
+  /* The variable now must have its original value.  */
   if (*vp != 0)
     {
       puts ("variable \"some_var\" not reset");
--- libc/elf/reldep2.c.jj	2001-09-08 18:21:56.000000000 +0200
+++ libc/elf/reldep2.c	2005-08-18 13:37:45.000000000 +0200
@@ -78,7 +78,7 @@ main (void)
       exit (1);
     }
 
-  /* The variable now must have its originial value.  */
+  /* The variable now must have its original value.  */
   if (*vp != 42)
     {
       puts ("variable \"some_var\" reset");
--- libc/elf/dl-open.c.jj	2005-06-22 18:34:11.000000000 +0200
+++ libc/elf/dl-open.c	2005-08-18 13:37:46.000000000 +0200
@@ -55,7 +55,7 @@ extern int __libc_multiple_libcs;	/* Def
 static void show_scope (struct link_map *new);
 #endif
 
-/* We must be carefull not to leave us in an inconsistent state.  Thus we
+/* We must be careful not to leave us in an inconsistent state.  Thus we
    catch any error and re-raise it after cleaning up.  */
 
 struct dl_open_args
--- libc/elf/dl-load.c.jj	2005-08-08 09:14:45.000000000 +0200
+++ libc/elf/dl-load.c	2005-08-18 13:37:45.000000000 +0200
@@ -125,7 +125,7 @@ int __stack_prot attribute_hidden attrib
    long respectively.  I.e., even with a file which has 10 program
    header entries we only have to read 372B/624B respectively.  Add to
    this a bit of margin for program notes and reading 512B and 832B
-   for 32-bit and 64-bit files respecitvely is enough.  If this
+   for 32-bit and 64-bit files respectively is enough.  If this
    heuristic should really fail for some file the code in
    `_dl_map_object_from_fd' knows how to recover.  */
 struct filebuf
@@ -249,7 +249,7 @@ _dl_dst_substitute (struct link_map *l, 
   char *last_elem, *wp;
 
   /* Now fill the result path.  While copying over the string we keep
-     track of the start of the last path element.  When we come accross
+     track of the start of the last path element.  When we come across
      a DST we copy over the value or (if the value is not available)
      leave the entire path element out.  */
   last_elem = wp = result;
@@ -1603,7 +1603,7 @@ open_verify (const char *name, struct fi
       unsigned int osversion;
       size_t maplength;
 
-      /* We successfully openened the file.  Now verify it is a file
+      /* We successfully opened the file.  Now verify it is a file
 	 we can use.  */
       __set_errno (0);
       fbp->len = __libc_read (fd, fbp->buf, sizeof (fbp->buf));
--- libc/elf/reldep3.c.jj	2000-08-27 01:38:18.000000000 +0200
+++ libc/elf/reldep3.c	2005-08-18 13:37:45.000000000 +0200
@@ -78,7 +78,7 @@ main (void)
       exit (1);
     }
 
-  /* The variable now must have its originial value.  */
+  /* The variable now must have its original value.  */
   if (*vp != 0)
     {
       puts ("variable \"some_var\" not reset");
--- libc/elf/nodelete.c.jj	2000-11-26 07:17:46.000000000 +0100
+++ libc/elf/nodelete.c	2005-08-18 13:37:45.000000000 +0200
@@ -23,7 +23,7 @@ static int
 do_test (void)
 {
   /* We are testing the two possibilities to mark an object as not deletable:
-     - marked on the linker commandline with `-z nodelete'
+     - marked on the linker command line with `-z nodelete'
      - with the RTLD_NODELETE flag at dlopen()-time.
 
      The test we are performing should be safe.  We are loading the objects,
--- libc/elf/dl-support.c.jj	2005-05-20 10:35:21.000000000 +0200
+++ libc/elf/dl-support.c	2005-08-18 13:37:46.000000000 +0200
@@ -143,7 +143,7 @@ const ElfW(Ehdr) *_dl_sysinfo_dso;
 #endif
 
 /* During the program run we must not modify the global data of
-   loaded shared object simultanously in two threads.  Therefore we
+   loaded shared object simultaneously in two threads.  Therefore we
    protect `_dl_open' and `_dl_close' in dl-close.c.
 
    This must be a recursive lock since the initializer function of
--- libc/elf/rtld.c.jj	2005-07-04 10:27:37.000000000 +0200
+++ libc/elf/rtld.c	2005-08-18 13:37:45.000000000 +0200
@@ -1099,7 +1099,7 @@ of this helper program; chances are you 
 	/* _dl_rtld_libname.next = NULL;	Already zero.  */
 	GL(dl_rtld_map).l_libname = &_dl_rtld_libname;
 
-	/* Ordinarilly, we would get additional names for the loader from
+	/* Ordinarily, we would get additional names for the loader from
 	   our DT_SONAME.  This can't happen if we were actually linked as
 	   a static executable (detect this case when we have no DYNAMIC).
 	   If so, assume the filename component of the interpreter path to
@@ -2143,7 +2143,7 @@ ERROR: ld.so: object '%s' cannot be load
 	    _dl_protect_relro (l);
 
 #ifdef USE_TLS
-	  /* Add object to slot information data if necessasy.  */
+	  /* Add object to slot information data if necessary.  */
 	  if (l->l_tls_blocksize != 0 && tls_init_tp_called)
 	    _dl_add_to_slotinfo (l);
 #endif
@@ -2169,7 +2169,7 @@ ERROR: ld.so: object '%s' cannot be load
       hp_timing_t add;
 #endif
 
-      /* If we are profiling we also must do lazy reloaction.  */
+      /* If we are profiling we also must do lazy relocation.  */
       GLRO(dl_lazy) |= consider_profiling;
 
       struct link_map *l = main_map;
@@ -2195,7 +2195,7 @@ ERROR: ld.so: object '%s' cannot be load
 				 consider_profiling);
 
 #ifdef USE_TLS
-	  /* Add object to slot information data if necessasy.  */
+	  /* Add object to slot information data if necessary.  */
 	  if (l->l_tls_blocksize != 0 && tls_init_tp_called)
 	    _dl_add_to_slotinfo (l);
 #endif
--- libc/elf/dl-version.c.jj	2005-03-08 13:05:15.000000000 +0100
+++ libc/elf/dl-version.c	2005-08-18 13:37:46.000000000 +0200
@@ -185,7 +185,7 @@ _dl_check_map_versions (struct link_map 
   /* Pointer to dynamic section with definitions.  */
   ElfW(Dyn) *def;
   /* We need to find out which is the highest version index used
-    in a dependecy.  */
+    in a dependency.  */
   unsigned int ndx_high = 0;
   /* Initialize to make the compiler happy.  */
   const char *errstring = NULL;
@@ -273,7 +273,7 @@ _dl_check_map_versions (struct link_map 
      the maximum index here as well.
 
      XXX We could avoid the loop by just taking the number of definitions
-     as an upper bound of new indeces.  */
+     as an upper bound of new indices.  */
   if (def != NULL)
     {
       ElfW(Verdef) *ent;
--- libc/elf/dl-dst.h.jj	2004-03-08 12:01:42.000000000 +0100
+++ libc/elf/dl-dst.h	2005-08-18 13:37:46.000000000 +0200
@@ -1,4 +1,4 @@
-/* Handling of dynamic sring tokens.
+/* Handling of dynamic string tokens.
    Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
--- libc/elf/sprof.c.jj	2005-01-19 14:12:39.000000000 +0100
+++ libc/elf/sprof.c	2005-08-18 13:37:45.000000000 +0200
@@ -117,7 +117,7 @@ static enum
 /* Nozero for testing.  */
 static int do_test;
 
-/* Strcuture describing calls.  */
+/* Structure describing calls.  */
 struct here_fromstruct
 {
   struct here_cg_arc_record volatile *here;
@@ -266,7 +266,7 @@ main (int argc, char *argv[])
     exit (1);
 
   /* We can now determine the filename for the profiling data, if
-     nececessary.  */
+     necessary.  */
   if (profdata == NULL)
     {
       char *newp;
@@ -381,7 +381,7 @@ load_shobj (const char *name)
 
   /* Since we use dlopen() we must be prepared to work around the sometimes
      strange lookup rules for the shared objects.  If we have a file foo.so
-     in the current directory and the user specfies foo.so on the command
+     in the current directory and the user specifies foo.so on the command
      line (without specifying a directory) we should load the file in the
      current directory even if a normal dlopen() call would read the other
      file.  We do this by adding a directory portion to the name.  */
@@ -785,7 +785,7 @@ load_profdata (const char *name, struct 
       return NULL;
     }
 
-  /* We don't need the file desriptor anymore.  */
+  /* We don't need the file descriptor anymore.  */
   if (close (fd) < 0)
     {
       error (0, errno, _("error while closing the profiling data file"));
--- libc/intl/dcigettext.c.jj	2005-05-03 21:44:29.000000000 +0200
+++ libc/intl/dcigettext.c	2005-08-18 13:37:46.000000000 +0200
@@ -601,7 +601,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, 
 	  /* When this is a SUID binary we must not allow accessing files
 	     outside the dedicated directories.  */
 	  if (ENABLE_SECURE && strchr (single_locale, '/') != NULL)
-	    /* Ingore this entry.  */
+	    /* Ignore this entry.  */
 	    continue;
 	}
 
--- libc/intl/tst-translit.c.jj	2001-07-06 06:54:53.000000000 +0200
+++ libc/intl/tst-translit.c	2005-08-18 13:37:46.000000000 +0200
@@ -1,4 +1,4 @@
-/* Test of translitation in the gettext functions.
+/* Test of transliteration in the gettext functions.
    Copyright (C) 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 2000.
--- libc/sunrpc/rpc_main.c.jj	2005-01-26 18:22:23.000000000 +0100
+++ libc/sunrpc/rpc_main.c	2005-08-18 13:37:46.000000000 +0200
@@ -401,7 +401,7 @@ open_input (const char *infile, const ch
     }
 }
 
-/* Close the connection to the C-preprocessor and check for successfull
+/* Close the connection to the C-preprocessor and check for successful
    termination.  */
 static void
 close_input (void)
--- libc/sunrpc/rpc_thread.c.jj	2003-02-22 02:57:51.000000000 +0100
+++ libc/sunrpc/rpc_thread.c	2005-08-18 13:37:46.000000000 +0200
@@ -73,7 +73,7 @@ __rpc_thread_variables (void)
 
 /* Global variables If we're single-threaded, or if this is the first
    thread using the variable, use the existing global variable.  This
-   provides backwards compatability for existing applications which
+   provides backwards compatibility for existing applications which
    dynamically link against this code.  */
 #undef svc_fdset
 #undef rpc_createerr
--- libc/sunrpc/rpc/clnt.h.jj	2003-09-02 09:08:57.000000000 +0200
+++ libc/sunrpc/rpc/clnt.h	2005-08-18 13:42:10.000000000 +0200
@@ -109,8 +109,8 @@ struct rpc_err {
     int RE_errno;		/* related system error */
     enum auth_stat RE_why;	/* why the auth error occurred */
     struct {
-      u_long low;		/* lowest verion supported */
-      u_long high;		/* highest verion supported */
+      u_long low;		/* lowest version supported */
+      u_long high;		/* highest version supported */
     } RE_vers;
     struct {			/* maybe meaningful if RPC_FAILED */
       long s1;
--- libc/sunrpc/key_call.c.jj	2005-03-08 13:05:19.000000000 +0100
+++ libc/sunrpc/key_call.c	2005-08-18 13:37:46.000000000 +0200
@@ -31,7 +31,7 @@
  */
 /*
  * The original source is from the RPCSRC 4.0 package from Sun Microsystems.
- * The Interface to keyserver protocoll 2, RPC over AF_UNIX and Linux/doors
+ * The Interface to keyserver protocol 2, RPC over AF_UNIX and Linux/doors
  * was added by Thorsten Kukuk <kukuk@suse.de>
  * Since the Linux/doors project was stopped, I doubt that this code will
  * ever be useful <kukuk@suse.de>.
--- libc/sunrpc/des_impl.c.jj	2005-03-08 13:05:19.000000000 +0100
+++ libc/sunrpc/des_impl.c	2005-08-18 13:37:46.000000000 +0200
@@ -353,7 +353,7 @@ static const unsigned long des_skb[8][64
 
 
 /* The changes to this macro may help or hinder, depending on the
- * compiler and the achitecture.  gcc2 always seems to do well :-).
+ * compiler and the architecture.  gcc2 always seems to do well :-).
  * Inspired by Dana How <how@isl.stanford.edu>
  * DO NOT use the alternative version on machines with 8 byte longs.
  */
--- libc/sunrpc/auth_des.c.jj	2005-02-21 17:20:13.000000000 +0100
+++ libc/sunrpc/auth_des.c	2005-08-18 13:37:46.000000000 +0200
@@ -85,7 +85,7 @@ struct ad_private {
   u_int ad_servernamelen;	/* length of name, rounded up */
   uint32_t ad_window;		/* client specified window */
   bool_t ad_dosync;		/* synchronize? */
-  struct sockaddr ad_syncaddr;	/* remote host to synch with */
+  struct sockaddr ad_syncaddr;	/* remote host to sync with */
   struct rpc_timeval ad_timediff;	/* server's time - client's time */
   uint32_t ad_nickname;		/* server's nickname for client */
   struct authdes_cred ad_cred;	/* storage for credential */
--- libc/sunrpc/xdr_rec.c.jj	2005-07-28 15:57:17.000000000 +0200
+++ libc/sunrpc/xdr_rec.c	2005-08-18 13:37:46.000000000 +0200
@@ -105,7 +105,7 @@ typedef struct rec_strm
     caddr_t out_base;		/* output buffer (points to frag header) */
     caddr_t out_finger;		/* next output position */
     caddr_t out_boundry;	/* data cannot up to this address */
-    u_int32_t *frag_header;	/* beginning of curren fragment */
+    u_int32_t *frag_header;	/* beginning of current fragment */
     bool_t frag_sent;		/* true if buffer sent in middle of record */
     /*
      * in-coming bits
@@ -613,7 +613,7 @@ set_input_fragment (RECSTREAM *rstrm)
   /*
    * Sanity check. Try not to accept wildly incorrect fragment
    * sizes. Unfortunately, only a size of zero can be identified as
-   * 'wildely incorrect', and this only, if it is not the last
+   * 'wildly incorrect', and this only, if it is not the last
    * fragment of a message. Ridiculously large fragment sizes may look
    * wrong, but we don't have any way to be certain that they aren't
    * what the client actually intended to send us. Many existing RPC
--- libc/obj/math/libm-test.c.jj	2005-07-28 16:04:34.000000000 +0200
+++ libc/obj/math/libm-test.c	2005-08-18 13:37:46.000000000 +0200
@@ -84,11 +84,11 @@
    aren't checked at the moment.
 
    NaN values: There exist signalling and quiet NaNs.  This implementation
-   only uses quiet NaN as parameter but does not differenciate
+   only uses quiet NaN as parameter but does not differentiate
    between the two kinds of NaNs as result.
 
    Inline functions: Inlining functions should give an improvement in
-   speed - but not in precission.  The inlined functions return
+   speed - but not in precision.  The inlined functions return
    reasonable values for a reasonable range of input values.  The
    result is not necessarily correct for all values and exceptions are
    not correctly raised in all cases.  Problematic input and return
@@ -137,7 +137,7 @@
 #define INVALID_EXCEPTION_OK		0x4
 #define DIVIDE_BY_ZERO_EXCEPTION_OK	0x8
 #define EXCEPTIONS_OK INVALID_EXCEPTION_OK+DIVIDE_BY_ZERO_EXCEPTION_OK
-/* Some special test flags, passed togther with exceptions.  */
+/* Some special test flags, passed together with exceptions.  */
 #define IGNORE_ZERO_INF_SIGN		0x10
 
 /* Various constants (we must supply them precalculated for accuracy).  */
@@ -3120,7 +3120,7 @@ lgamma_test (void)
 static void
 lrint_test (void)
 {
-  /* XXX this test is incomplete.  We need to have a way to specifiy
+  /* XXX this test is incomplete.  We need to have a way to specify
      the rounding method and test the critical cases.  So far, only
      unproblematic numbers are tested.  */
 
@@ -3152,7 +3152,7 @@ lrint_test (void)
 static void
 llrint_test (void)
 {
-  /* XXX this test is incomplete.  We need to have a way to specifiy
+  /* XXX this test is incomplete.  We need to have a way to specify
      the rounding method and test the critical cases.  So far, only
      unproblematic numbers are tested.  */
 
--- libc/sysdeps/unix/sockatmark.c.jj	2001-08-17 08:44:34.000000000 +0200
+++ libc/sysdeps/unix/sockatmark.c	2005-08-18 13:37:46.000000000 +0200
@@ -19,7 +19,7 @@
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 
-/* Determine wheter socket is at a out-of-band mark.  */
+/* Determine whether socket is at a out-of-band mark.  */
 int
 sockatmark (fd)
      int fd;
--- libc/sysdeps/unix/readdir.c.jj	2002-08-28 05:26:37.000000000 +0200
+++ libc/sysdeps/unix/readdir.c	2005-08-18 13:37:47.000000000 +0200
@@ -71,7 +71,7 @@ __READDIR (DIR *dirp)
 	      if (bytes < 0 && errno == ENOENT)
 		bytes = 0;
 
-	      /* Don't modifiy errno when reaching EOF.  */
+	      /* Don't modify errno when reaching EOF.  */
 	      if (bytes == 0)
 		__set_errno (saved_errno);
 	      dp = NULL;
@@ -94,7 +94,7 @@ __READDIR (DIR *dirp)
       reclen = sizeof *dp;
       /* The name is not terminated if it is the largest possible size.
 	 Clobber the following byte to ensure proper null termination.  We
-	 read jst one entry at a time above so we know that byte will not
+	 read just one entry at a time above so we know that byte will not
 	 be used later.  */
       dp->d_name[sizeof dp->d_name] = '\0';
 #endif
--- libc/sysdeps/unix/sysv/linux/kernel-features.h.jj	2005-05-04 10:32:13.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/kernel-features.h	2005-08-18 13:37:47.000000000 +0200
@@ -69,7 +69,7 @@
 # define __ASSUME_LCHOWN_SYSCALL	1
 #endif
 
-/* When did the `setresuid' sysall became available?  */
+/* When did the `setresuid' syscall became available?  */
 #if __LINUX_KERNEL_VERSION >= 131584 && !defined __sparc__
 # define __ASSUME_SETRESUID_SYSCALL	1
 #endif
@@ -352,7 +352,7 @@
 # define __ASSUME_CORRECT_SI_PID	1
 #endif
 
-/* The tgkill syscall was instroduced for i386 in 2.5.75.  For Alpha
+/* The tgkill syscall was introduced for i386 in 2.5.75.  For Alpha
    it was introduced in 2.6.0-test1 which unfortunately cannot be
    distinguished from 2.6.0.  On x86-64, ppc, and ppc64 it was
    introduced in 2.6.0-test3. */
--- libc/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S.jj	2004-01-27 15:44:26.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S	2005-08-18 13:37:50.000000000 +0200
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 
-/* On Alpha we desparately want to avoid having to issue an imb.  Ordinarily
+/* On Alpha we desperately want to avoid having to issue an imb.  Ordinarily
    the kernel would have to issue one after setting up the signal return
    stack, but the Linux rt_sigaction syscall is prepared to accept a pointer
    to the sigreturn syscall, instead of inlining it on the stack.
--- libc/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h.jj	2005-06-06 11:41:17.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h	2005-08-18 13:37:46.000000000 +0200
@@ -88,8 +88,8 @@
 
 #ifdef __USE_GNU
 # define F_SETLEASE	1024	/* Set a lease.	 */
-# define F_GETLEASE	1025	/* Enquire what lease is active.  */
-# define F_NOTIFY	1026	/* Request notfications on a directory.	 */
+# define F_GETLEASE	1025	/* Inquire what lease is active.  */
+# define F_NOTIFY	1026	/* Request notifications on a directory.	 */
 #endif
 
 /* for F_[GET|SET]FL */
@@ -127,7 +127,7 @@
 # define DN_CREATE	0x00000004	/* File created.  */
 # define DN_DELETE	0x00000008	/* File removed.  */
 # define DN_RENAME	0x00000010	/* File renamed.  */
-# define DN_ATTRIB	0x00000020	/* File changed attibutes.  */
+# define DN_ATTRIB	0x00000020	/* File changed attributes.  */
 # define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
 #endif
 
--- libc/sysdeps/unix/sysv/linux/alpha/bits/netdb.h.jj	2001-07-06 06:56:13.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/bits/netdb.h	2005-08-18 13:43:44.000000000 +0200
@@ -30,6 +30,6 @@ struct netent
   char **n_aliases;		/* Alias list.  */
   int n_addrtype;		/* Net address type.  */
   /* XXX We should probably use uint32_t for the field and ensure
-     compatiblity by adding appropriate padding.  */
+     compatibility by adding appropriate padding.  */
   unsigned long	int n_net;	/* Network number.  */
 };
--- libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h.jj	2005-06-23 12:15:48.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/bits/resource.h	2005-08-18 13:37:46.000000000 +0200
@@ -95,7 +95,7 @@ enum __rlimit_resource
   __RLIMIT_NICE = 13,
 #define RLIMIT_NICE __RLIMIT_NICE
 
-  /* Maximum realtime priority allowed for non-priviledged
+  /* Maximum realtime priority allowed for non-privileged
      processes.  */
   __RLIMIT_RTPRIO = 14,
 #define RLIMIT_RTPRIO __RLIMIT_RTPRIO
--- libc/sysdeps/unix/sysv/linux/alpha/getcontext.S.jj	2005-06-06 11:41:17.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/getcontext.S	2005-08-18 13:37:50.000000000 +0200
@@ -45,7 +45,7 @@ weak_alias (__getcontext, getcontext)
 
 
 /* An internal routine used by getcontext and setcontext.
-   The incomming return address register is $0.  */
+   The incoming return address register is $0.  */
 
 	.align	4
 	.globl	__getcontext_x
--- libc/sysdeps/unix/sysv/linux/alpha/sys/procfs.h.jj	2001-07-06 06:56:13.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/sys/procfs.h	2005-08-18 13:44:02.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somehow modelled after the file of the same name on SysVr4
+/* This is somehow modeled after the file of the same name on SysVr4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  */
 
@@ -103,7 +103,7 @@ typedef gregset_t prgregset_t;
 typedef fpregset_t prfpregset_t;
 
 /* We don't have any differences between processes and threads,
-   therefore habe only ine PID type.  */
+   therefore have only one PID type.  */
 typedef __pid_t lwpid_t;
 
 
--- libc/sysdeps/unix/sysv/linux/alpha/setitimer.S.jj	2003-06-20 18:24:36.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/setitimer.S	2005-08-18 13:37:51.000000000 +0200
@@ -101,7 +101,7 @@ $do32:
 	callsys
 	bne	a3, $error
 
-	/* Conditionaly bounce old value up.  */
+	/* Conditionally bounce old value up.  */
 	ldq	a2, 16(sp)
 	bne	a2, 2f
 	ldl	t0, 0(a2)
--- libc/sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h.jj	1998-02-24 16:22:07.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/alpha/kernel_sigaction.h	2005-08-18 13:44:27.000000000 +0200
@@ -1,4 +1,4 @@
-/* This is the sigaction struction from the Linux 2.1.20 kernel.  */
+/* This is the sigaction structure from the Linux 2.1.20 kernel.  */
 
 struct old_kernel_sigaction {
 	__sighandler_t k_sa_handler;
--- libc/sysdeps/unix/sysv/linux/s390/s390-32/chown.c.jj	2004-03-11 11:10:24.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/s390/s390-32/chown.c	2005-08-18 13:37:46.000000000 +0200
@@ -95,7 +95,7 @@ __real_chown (const char *file, uid_t ow
 
 
 #if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
-/* Compiling for compatibiity.  */
+/* Compiling for compatibility.  */
 int
 attribute_compat_text_section
 __chown_is_lchown (const char *file, uid_t owner, gid_t group)
--- libc/sysdeps/unix/sysv/linux/s390/s390-32/swapcontext.S.jj	2005-06-06 11:41:19.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/s390/s390-32/swapcontext.S	2005-08-18 13:37:51.000000000 +0200
@@ -25,7 +25,7 @@
 /*  __swapcontext (ucontext_t *oucp, const ucontext_t *ucp)
 
   Saves the machine context in oucp such that when it is activated,
-  it appears as if __swapcontextt() returned again, restores the
+  it appears as if __swapcontext() returned again, restores the
   machine context in ucp and thereby resumes execution in that
   context.
 
--- libc/sysdeps/unix/sysv/linux/s390/s390-32/socket.S.jj	2003-12-11 22:23:20.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/s390/s390-32/socket.S	2005-08-18 13:37:51.000000000 +0200
@@ -25,7 +25,7 @@
 #define P2(a, b) a##b
 
 	.text
-/* The socket-oriented system calls are handled unusally in Linux.
+/* The socket-oriented system calls are handled unusually in Linux.
    They are all gated through the single `socketcall' system call number.
    `socketcall' takes two arguments: the first is the subcode, specifying
    which socket function is being called; and the second is a pointer to
--- libc/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h.jj	2004-10-06 11:05:09.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h	2005-08-18 13:37:46.000000000 +0200
@@ -44,7 +44,7 @@
    a large offset.  Therefore we must not anymore test for < 0, but test
    for a real error by making sure the value in gpr2 is a real error
    number.  Linus said he will make sure the no syscall returns a value
-   in -1 .. -4095 as a valid result so we can savely test with -4095.  */
+   in -1 .. -4095 as a valid result so we can safely test with -4095.  */
 
 #undef PSEUDO
 #define	PSEUDO(name, syscall_name, args)				      \
--- libc/sysdeps/unix/sysv/linux/s390/s390-32/syscall.S.jj	2003-12-11 22:23:20.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/s390/s390-32/syscall.S	2005-08-18 13:37:51.000000000 +0200
@@ -54,7 +54,7 @@ ENTRY (syscall)
 	jl     2f
 1:	svc    0
 	j      3f
-2:	ex     %r1,1b-0b(%r7)      /* lsb of R1 is subsituted as SVC number */
+2:	ex     %r1,1b-0b(%r7)      /* lsb of R1 is substituted as SVC number */
 3:	l      %r15,0(%r15)        /* load back chain */
 	cfi_adjust_cfa_offset (-96)
 	lm     %r6,15,24(%r15)     /* load registers */
--- libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h.jj	2004-08-30 12:04:06.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/s390/bits/fcntl.h	2005-08-18 13:37:46.000000000 +0200
@@ -106,8 +106,8 @@
 
 #ifdef __USE_GNU
 # define F_SETLEASE	1024	/* Set a lease.	 */
-# define F_GETLEASE	1025	/* Enquire what lease is active.  */
-# define F_NOTIFY	1026	/* Request notfications on a directory.	 */
+# define F_GETLEASE	1025	/* Inquire what lease is active.  */
+# define F_NOTIFY	1026	/* Request notifications on a directory.	 */
 #endif
 
 /* For F_[GET|SET]FL.  */
@@ -145,7 +145,7 @@
 # define DN_CREATE	0x00000004	/* File created.  */
 # define DN_DELETE	0x00000008	/* File removed.  */
 # define DN_RENAME	0x00000010	/* File renamed.  */
-# define DN_ATTRIB	0x00000020	/* File changed attibutes.  */
+# define DN_ATTRIB	0x00000020	/* File changed attributes.  */
 # define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
 #endif
 
--- libc/sysdeps/unix/sysv/linux/s390/sys/procfs.h.jj	2003-12-11 22:23:20.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/s390/sys/procfs.h	2005-08-18 13:37:46.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somewhat modelled after the file of the same name on SVR4
+/* This is somewhat modeled after the file of the same name on SVR4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  It doesn't have anything to do with the /proc file
    system, even though Linux has one.
--- libc/sysdeps/unix/sysv/linux/s390/s390-64/swapcontext.S.jj	2005-06-06 11:41:19.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/swapcontext.S	2005-08-18 13:37:51.000000000 +0200
@@ -25,7 +25,7 @@
 /*  __swapcontext (ucontext_t *oucp, const ucontext_t *ucp)
 
   Saves the machine context in oucp such that when it is activated,
-  it appears as if __swapcontextt() returned again, restores the
+  it appears as if __swapcontext() returned again, restores the
   machine context in ucp and thereby resumes execution in that
   context.
 
--- libc/sysdeps/unix/sysv/linux/s390/s390-64/socket.S.jj	2003-12-11 22:23:20.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/socket.S	2005-08-18 13:37:51.000000000 +0200
@@ -25,7 +25,7 @@
 #define P2(a, b) a##b
 
         .text
-/* The socket-oriented system calls are handled unusally in Linux.
+/* The socket-oriented system calls are handled unusually in Linux.
    They are all gated through the single `socketcall' system call number.
    `socketcall' takes two arguments: the first is the subcode, specifying
    which socket function is being called; and the second is a pointer to
--- libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h.jj	2004-10-06 11:05:09.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h	2005-08-18 13:37:46.000000000 +0200
@@ -56,7 +56,7 @@
    a large offset.  Therefore we must not anymore test for < 0, but test
    for a real error by making sure the value in gpr2 is a real error
    number.  Linus said he will make sure the no syscall returns a value
-   in -1 .. -4095 as a valid result so we can savely test with -4095.  */
+   in -1 .. -4095 as a valid result so we can safely test with -4095.  */
 
 #undef PSEUDO
 #define	PSEUDO(name, syscall_name, args)				      \
--- libc/sysdeps/unix/sysv/linux/s390/s390-64/syscall.S.jj	2003-12-11 22:23:20.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/s390/s390-64/syscall.S	2005-08-18 13:37:51.000000000 +0200
@@ -54,7 +54,7 @@ ENTRY (syscall)
 	jl     2f
 1:	svc    0
 	j      3f
-2:	ex     %r1,1b-0b(%r7)      /* lsb of R1 is subsituted as SVC number */
+2:	ex     %r1,1b-0b(%r7)      /* lsb of R1 is substituted as SVC number */
 3:	lg     %r15,0(%r15)        /* load back chain */
 	cfi_adjust_cfa_offset (-160)
 	lmg	%r6,15,48(%r15)	   /* Load registers.  */
--- libc/sysdeps/unix/sysv/linux/net/ethernet.h.jj	2001-09-14 15:03:53.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/net/ethernet.h	2005-08-18 13:37:46.000000000 +0200
@@ -56,7 +56,7 @@ struct ether_header
 #define	ETHER_MIN_LEN	(ETH_ZLEN + ETHER_CRC_LEN) /* min packet length */
 #define	ETHER_MAX_LEN	(ETH_FRAME_LEN + ETHER_CRC_LEN) /* max packet length */
 
-/* make sure ethenet length is valid */
+/* make sure ethernet length is valid */
 #define	ETHER_IS_VALID_LEN(foo)	\
 	((foo) >= ETHER_MIN_LEN && (foo) <= ETHER_MAX_LEN)
 
--- libc/sysdeps/unix/sysv/linux/net/if_shaper.h.jj	2001-07-06 06:56:18.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/net/if_shaper.h	2005-08-18 13:37:46.000000000 +0200
@@ -28,7 +28,7 @@ __BEGIN_DECLS
 
 #define SHAPER_QLEN	10
 /*
- *	This is a bit speed dependant (read it shouldnt be a constant!)
+ *	This is a bit speed dependent (read it shouldn't be a constant!)
  *
  *	5 is about right for 28.8 upwards. Below that double for every
  *	halving of speed or so. - ie about 20 for 9600 baud.
--- libc/sysdeps/unix/sysv/linux/powerpc/chown.c.jj	2003-09-03 13:10:51.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/chown.c	2005-08-18 13:37:46.000000000 +0200
@@ -75,7 +75,7 @@ __chown (const char *file, uid_t owner, 
      }
    memcpy (path, file, filelen);
 
-   /* 'The system has an arbitrary limit...'  In practise, we'll hit
+   /* 'The system has an arbitrary limit...'  In practice, we'll hit
       ENAMETOOLONG before this, usually.  */
    for (loopct = 0; loopct < 128; loopct++)
    {
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S.jj	2004-12-21 14:33:47.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S	2005-08-18 13:37:51.000000000 +0200
@@ -22,7 +22,7 @@
 #define P(a, b) P2(a, b)
 #define P2(a, b) a##b
 
-/* The socket-oriented system calls are handled unusally in Linux.
+/* The socket-oriented system calls are handled unusually in Linux.
    They are all gated through the single `socketcall' system call number.
    `socketcall' takes two arguments: the first is the subcode, specifying
    which socket function is being called; and the second is a pointer to
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h.jj	2005-04-26 12:07:14.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h	2005-08-18 13:37:46.000000000 +0200
@@ -29,7 +29,7 @@
 #include <errno.h>
 #endif
 
-/* Some systen calls got renamed over time, but retained the same semantics.
+/* Some system calls got renamed over time, but retained the same semantics.
    Handle them here so they can be catched by both C and assembler stubs in
    glibc.  */
 
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S.jj	2004-12-21 14:36:18.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S	2005-08-18 13:37:51.000000000 +0200
@@ -82,7 +82,7 @@ ENTRY (BP_SYM (__clone))
 	/* Check for child process.  */
 	cmpdi	cr1,r3,0
 	crandc	cr1*4+eq,cr1*4+eq,cr0*4+so
-	bne-	cr1,L(parent)		/* The '-' is to minimise the race.  */
+	bne-	cr1,L(parent)		/* The '-' is to minimize the race.  */
 
 #ifdef RESET_PID
 	andis.	r0,r28,CLONE_THREAD>>16
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S.jj	2005-06-20 11:20:12.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/socket.S	2005-08-18 13:37:51.000000000 +0200
@@ -22,7 +22,7 @@
 #define P(a, b) P2(a, b)
 #define P2(a, b) a##b
 
-/* The socket-oriented system calls are handled unusally in Linux.
+/* The socket-oriented system calls are handled unusually in Linux.
    They are all gated through the single `socketcall' system call number.
    `socketcall' takes two arguments: the first is the subcode, specifying
    which socket function is being called; and the second is a pointer to
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h.jj	2005-02-25 14:45:15.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h	2005-08-18 13:37:46.000000000 +0200
@@ -21,7 +21,7 @@
 
 #include <sysdeps/unix/powerpc/sysdep.h>
 
-/* Some systen calls got renamed over time, but retained the same semantics.
+/* Some system calls got renamed over time, but retained the same semantics.
    Handle them here so they can be catched by both C and assembler stubs in
    glibc.  */
 
--- libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S.jj	2005-05-26 14:21:52.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S	2005-08-18 13:37:51.000000000 +0200
@@ -89,7 +89,7 @@ ENTRY (BP_SYM (__clone))
 	/* Check for child process.  */
 	cmpwi	cr1,r3,0
 	crandc	cr1*4+eq,cr1*4+eq,cr0*4+so
-	bne-	cr1,L(parent)		/* The '-' is to minimise the race.  */
+	bne-	cr1,L(parent)		/* The '-' is to minimize the race.  */
 
 #ifndef __ASSUME_FIXED_CLONE_SYSCALL
 	/* On at least mklinux DR3a5, clone() doesn't actually change
--- libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h.jj	2004-08-30 12:04:06.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h	2005-08-18 13:37:46.000000000 +0200
@@ -92,8 +92,8 @@
 
 #ifdef __USE_GNU
 # define F_SETLEASE	1024	/* Set a lease.	 */
-# define F_GETLEASE	1025	/* Enquire what lease is active.  */
-# define F_NOTIFY	1026	/* Request notfications on a directory.	 */
+# define F_GETLEASE	1025	/* Inquire what lease is active.  */
+# define F_NOTIFY	1026	/* Request notifications on a directory.	 */
 #endif
 
 /* For F_[GET|SET]FL.  */
@@ -131,7 +131,7 @@
 # define DN_CREATE	0x00000004	/* File created.  */
 # define DN_DELETE	0x00000008	/* File removed.  */
 # define DN_RENAME	0x00000010	/* File renamed.  */
-# define DN_ATTRIB	0x00000020	/* File changed attibutes.  */
+# define DN_ATTRIB	0x00000020	/* File changed attributes.  */
 # define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
 #endif
 
--- libc/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h.jj	2005-03-17 21:58:52.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/powerpc/sys/ucontext.h	2005-08-18 13:37:46.000000000 +0200
@@ -67,7 +67,7 @@ typedef struct
  * the mcontext upto but not including the v_regs field.  For kernels that 
  * don't AT_HWCAP or return AT_HWCAP without PPC_FEATURE_HAS_ALTIVEC the 
  * v_regs field may not exit and should not be referenced.  The v_regd field
- * can be refernced safely only after verifying that PPC_FEATURE_HAS_ALTIVEC
+ * can be referenced safely only after verifying that PPC_FEATURE_HAS_ALTIVEC
  * is set in AT_HWCAP.  */
     
 /* Number of general registers.  */
@@ -116,7 +116,7 @@ typedef struct {
  * either NULL (if this processor does not support the VMX feature) or the 
  * address of the first quadword within the allocated (vmx_reserve) area.
  *
- * The pointer (v_regs) of vector type (elf_vrreg_t) is essentually  
+ * The pointer (v_regs) of vector type (elf_vrreg_t) is essentially  
  * an array of 34 quadword entries.  The entries with 
  * indexes 0-31 contain the corresponding vector registers.  The entry with 
  * index 32 contains the vscr as the last word (offset 12) within the 
--- libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h.jj	2005-03-03 07:50:32.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/powerpc/sys/procfs.h	2005-08-18 13:45:15.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somehow modelled after the file of the same name on SysVr4
+/* This is somehow modeled after the file of the same name on SysVr4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  */
 
@@ -124,7 +124,7 @@ typedef elf_gregset_t prgregset_t;
 typedef elf_fpregset_t prfpregset_t;
 
 /* We don't have any differences between processes and threads,
-   therefore habe only ine PID type.  */
+   therefore have only one PID type.  */
 typedef __pid_t lwpid_t;
 
 
--- libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h.jj	2004-08-30 12:04:08.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sparc/bits/fcntl.h	2005-08-18 13:37:46.000000000 +0200
@@ -99,8 +99,8 @@
 
 #ifdef __USE_GNU
 # define F_SETLEASE     1024	/* Set a lease.  */
-# define F_GETLEASE     1025	/* Enquire what lease is active.  */
-# define F_NOTIFY       1026	/* Request notfications on a directory.  */
+# define F_GETLEASE     1025	/* Inquire what lease is active.  */
+# define F_NOTIFY       1026	/* Request notifications on a directory.  */
 #endif
 
 #if __WORDSIZE == 64
@@ -148,7 +148,7 @@
 # define DN_CREATE	0x00000004	/* File created.  */
 # define DN_DELETE	0x00000008	/* File removed.  */
 # define DN_RENAME	0x00000010	/* File renamed.  */
-# define DN_ATTRIB	0x00000020	/* File changed attibutes.  */
+# define DN_ATTRIB	0x00000020	/* File changed attributes.  */
 # define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
 #endif
 
--- libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h.jj	2005-06-23 12:15:49.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sparc/bits/resource.h	2005-08-18 13:37:46.000000000 +0200
@@ -95,7 +95,7 @@ enum __rlimit_resource
   __RLIMIT_NICE = 13,
 #define RLIMIT_NICE __RLIMIT_NICE
 
-  /* Maximum realtime priority allowed for non-priviledged
+  /* Maximum realtime priority allowed for non-privileged
      processes.  */
   __RLIMIT_RTPRIO = 14,
 #define RLIMIT_RTPRIO __RLIMIT_RTPRIO
--- libc/sysdeps/unix/sysv/linux/sparc/sys/ucontext.h.jj	2001-07-06 06:56:21.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sparc/sys/ucontext.h	2005-08-18 13:45:43.000000000 +0200
@@ -87,7 +87,7 @@ typedef struct ucontext {
 	__sigset_t		uc_sigmask;
 } ucontext_t;
 
-#endif /* __WORDISIZE == 64 */
+#endif /* __WORDSIZE == 64 */
 
 /*
  * Location of the users' stored registers relative to R0.
@@ -143,7 +143,7 @@ typedef greg_t  gregset_t[NGREG];
  * The following structures define how a register window can appear on the
  * stack. This structure is available (when required) through the `gwins'
  * field of an mcontext (nested within ucontext). SPARC_MAXWINDOW is the
- * maximum number of outstanding regiters window defined in the SPARC
+ * maximum number of outstanding registers window defined in the SPARC
  * architecture (*not* implementation).
  */
 #define SPARC_MAXREGWINDOW	31	/* max windows in SPARC arch. */
@@ -172,7 +172,7 @@ typedef struct gwindows
 /*
  * struct fq defines the minimal format of a floating point instruction queue
  * entry. The size of entries in the floating point queue are implementation
- * dependent. The union FQu is guarenteed to be the first field in any ABI
+ * dependent. The union FQu is guaranteed to be the first field in any ABI
  * conformant system implementation. Any additional fields provided by an
  * implementation should not be used applications designed to be ABI conformant. */
 
--- libc/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h.jj	2001-07-06 06:56:21.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h	2005-08-18 13:37:46.000000000 +0200
@@ -25,7 +25,7 @@
 #include <bits/wordsize.h>
 
 /* Linux/SPARC kernels up to 2.3.18 do not care much
-   about what namespace polution, so use a kludge now.  */
+   about what namespace pollution, so use a kludge now.  */
 #undef PTRACE_GETREGS
 #undef PTRACE_SETREGS
 #undef PTRACE_GETFPREGS
--- libc/sysdeps/unix/sysv/linux/sparc/sys/procfs.h.jj	2002-05-21 04:09:49.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sparc/sys/procfs.h	2005-08-18 13:37:46.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somehow modelled after the file of the same name on SysVr4
+/* This is somehow modeled after the file of the same name on SysVr4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  */
 
--- libc/sysdeps/unix/sysv/linux/pathconf.c.jj	2003-09-05 12:39:10.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/pathconf.c	2005-08-18 13:37:47.000000000 +0200
@@ -62,7 +62,7 @@ __statfs_link_max (int result, const str
 	/* Not possible, return the default value.  */
 	return LINUX_LINK_MAX;
 
-      /* Some error occured.  */
+      /* Some error occurred.  */
       return -1;
     }
 
@@ -115,7 +115,7 @@ __statfs_filesize_max (int result, const
 	/* Not possible, return the default value.  */
 	return 32;
 
-      /* Some error occured.  */
+      /* Some error occurred.  */
       return -1;
     }
 
@@ -156,7 +156,7 @@ __statfs_symlinks (int result, const str
 	/* Not possible, return the default value.  */
 	return 1;
 
-      /* Some error occured.  */
+      /* Some error occurred.  */
       return -1;
     }
 
--- libc/sysdeps/unix/sysv/linux/mips/bits/fcntl.h.jj	2004-11-25 14:36:29.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/mips/bits/fcntl.h	2005-08-18 13:37:46.000000000 +0200
@@ -94,8 +94,8 @@
 
 #ifdef __USE_GNU
 # define F_SETLEASE	1024	/* Set a lease.	 */
-# define F_GETLEASE	1025	/* Enquire what lease is active.  */
-# define F_NOTIFY	1026	/* Request notfications on a directory.	 */
+# define F_GETLEASE	1025	/* Inquire what lease is active.  */
+# define F_NOTIFY	1026	/* Request notifications on a directory.	 */
 #endif
 
 /* for F_[GET|SET]FL */
@@ -133,7 +133,7 @@
 # define DN_CREATE	0x00000004	/* File created.  */
 # define DN_DELETE	0x00000008	/* File removed.  */
 # define DN_RENAME	0x00000010	/* File renamed.  */
-# define DN_ATTRIB	0x00000020	/* File changed attibutes.  */
+# define DN_ATTRIB	0x00000020	/* File changed attributes.  */
 # define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
 #endif
 
--- libc/sysdeps/unix/sysv/linux/mips/bits/resource.h.jj	2005-06-22 18:34:25.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/mips/bits/resource.h	2005-08-18 13:37:46.000000000 +0200
@@ -95,7 +95,7 @@ enum __rlimit_resource
   __RLIMIT_NICE = 13,
 #define RLIMIT_NICE __RLIMIT_NICE
 
-  /* Maximum realtime priority allowed for non-priviledged
+  /* Maximum realtime priority allowed for non-privileged
      processes.  */
   __RLIMIT_RTPRIO = 14,
 #define RLIMIT_RTPRIO _RLIMIT_RTPRIO
--- libc/sysdeps/unix/sysv/linux/mips/sys/procfs.h.jj	2004-11-25 14:36:29.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/mips/sys/procfs.h	2005-08-18 13:46:01.000000000 +0200
@@ -20,7 +20,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somehow modelled after the file of the same name on SysVr4
+/* This is somehow modeled after the file of the same name on SysVr4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  */
 
@@ -116,7 +116,7 @@ typedef elf_gregset_t prgregset_t;
 typedef elf_fpregset_t prfpregset_t;
 
 /* We don't have any differences between processes and threads,
-   therefore habe only ine PID type.  */
+   therefore have only one PID type.  */
 typedef __pid_t lwpid_t;
 
 
--- libc/sysdeps/unix/sysv/linux/sh/socket.S.jj	2004-03-23 15:51:53.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sh/socket.S	2005-08-18 13:37:51.000000000 +0200
@@ -24,7 +24,7 @@
 #define P2(a, b) a##b
 
 	.text
-/* The socket-oriented system calls are handled unusally in Linux.
+/* The socket-oriented system calls are handled unusually in Linux.
    They are all gated through the single `socketcall' system call number.
    `socketcall' takes two arguments: the first is the subcode, specifying
    which socket function is being called; and the second is a pointer to
--- libc/sysdeps/unix/sysv/linux/sh/sys/procfs.h.jj	2004-11-20 18:56:16.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sh/sys/procfs.h	2005-08-18 13:46:13.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somehow modelled after the file of the same name on SysVr4
+/* This is somehow modeled after the file of the same name on SysVr4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  */
 
@@ -103,7 +103,7 @@ typedef elf_gregset_t prgregset_t;
 typedef elf_fpregset_t prfpregset_t;
 
 /* We don't have any differences between processes and threads,
-   therefore habe only ine PID type.  */
+   therefore have only one PID type.  */
 typedef __pid_t lwpid_t;
 
 
--- libc/sysdeps/unix/sysv/linux/sh/sysdep.h.jj	2004-10-05 09:05:02.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sh/sysdep.h	2005-08-18 13:37:46.000000000 +0200
@@ -43,7 +43,7 @@
    might return a large offset.  Therefore we must not anymore test
    for < 0, but test for a real error by making sure the value in R0
    is a real error number.  Linus said he will make sure the no syscall
-   returns a value in -1 .. -4095 as a valid result so we can savely
+   returns a value in -1 .. -4095 as a valid result so we can safely
    test with -4095.  */
 
 #define _IMM1 #-1
--- libc/sysdeps/unix/sysv/linux/if_index.c.jj	2005-06-20 11:20:11.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/if_index.c	2005-08-18 13:43:13.000000000 +0200
@@ -409,7 +409,7 @@ __protocol_available (int *have_inet, in
   struct ifconf ifc;
 # define RQ_IFS	4
 
-  /* Wirst case assumption.  */
+  /* Worst case assumption.  */
   *have_inet = 0;
   *have_inet6 = 0;
 
--- libc/sysdeps/unix/sysv/linux/i386/chown.c.jj	2004-03-10 10:32:06.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/i386/chown.c	2005-08-18 13:37:46.000000000 +0200
@@ -134,7 +134,7 @@ __chown_is_lchown (const char *file, uid
   return INLINE_SYSCALL (chown, 3, CHECK_STRING (file), owner, group);
 }
 #elif SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
-/* Compiling for compatibiity.  */
+/* Compiling for compatibility.  */
 int
 attribute_compat_text_section
 __chown_is_lchown (const char *file, uid_t owner, gid_t group)
--- libc/sysdeps/unix/sysv/linux/i386/socket.S.jj	2005-05-03 21:44:58.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/i386/socket.S	2005-08-18 13:37:51.000000000 +0200
@@ -24,7 +24,7 @@
 #define P2(a, b) a##b
 
 	.text
-/* The socket-oriented system calls are handled unusally in Linux.
+/* The socket-oriented system calls are handled unusually in Linux.
    They are all gated through the single `socketcall' system call number.
    `socketcall' takes two arguments: the first is the subcode, specifying
    which socket function is being called; and the second is a pointer to
--- libc/sysdeps/unix/sysv/linux/i386/bits/fcntl.h.jj	2004-08-30 12:04:03.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/i386/bits/fcntl.h	2005-08-18 13:37:46.000000000 +0200
@@ -92,8 +92,8 @@
 
 #ifdef __USE_GNU
 # define F_SETLEASE	1024	/* Set a lease.	 */
-# define F_GETLEASE	1025	/* Enquire what lease is active.  */
-# define F_NOTIFY	1026	/* Request notfications on a directory.	 */
+# define F_GETLEASE	1025	/* Inquire what lease is active.  */
+# define F_NOTIFY	1026	/* Request notifications on a directory.	 */
 #endif
 
 /* For F_[GET|SET]FL.  */
@@ -131,7 +131,7 @@
 # define DN_CREATE	0x00000004	/* File created.  */
 # define DN_DELETE	0x00000008	/* File removed.  */
 # define DN_RENAME	0x00000010	/* File renamed.  */
-# define DN_ATTRIB	0x00000020	/* File changed attibutes.  */
+# define DN_ATTRIB	0x00000020	/* File changed attributes.  */
 # define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
 #endif
 
--- libc/sysdeps/unix/sysv/linux/i386/sys/procfs.h.jj	2001-07-06 06:56:17.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/i386/sys/procfs.h	2005-08-18 13:37:46.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somewhat modelled after the file of the same name on SVR4
+/* This is somewhat modeled after the file of the same name on SVR4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  It doesn't have anything to do with the /proc file
    system, even though Linux has one.
--- libc/sysdeps/unix/sysv/linux/i386/sysdep.h.jj	2005-05-26 14:21:50.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/i386/sysdep.h	2005-08-18 13:37:46.000000000 +0200
@@ -54,7 +54,7 @@
    might return a large offset.  Therefore we must not anymore test
    for < 0, but test for a real error by making sure the value in %eax
    is a real error number.  Linus said he will make sure the no syscall
-   returns a value in -1 .. -4095 as a valid result so we can savely
+   returns a value in -1 .. -4095 as a valid result so we can safely
    test with -4095.  */
 
 /* We don't want the label for the error handle to be global when we define
--- libc/sysdeps/unix/sysv/linux/sigprocmask.c.jj	2004-09-30 00:50:16.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sigprocmask.c	2005-08-18 13:44:53.000000000 +0200
@@ -18,7 +18,7 @@
 
 #include <errno.h>
 #include <signal.h>
-#include <string.h>	/* Neede for string function builtin redirection.  */
+#include <string.h>	/* Needed for string function builtin redirection.  */
 #include <unistd.h>
 
 #include <sysdep.h>
--- libc/sysdeps/unix/sysv/linux/m68k/socket.S.jj	2002-12-27 23:15:18.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/m68k/socket.S	2005-08-18 13:37:51.000000000 +0200
@@ -23,7 +23,7 @@
 #define P2(a, b) a##b
 
 	.text
-/* The socket-oriented system calls are handled unusally in Linux.
+/* The socket-oriented system calls are handled unusually in Linux.
    They are all gated through the single `socketcall' system call number.
    `socketcall' takes two arguments: the first is the subcode, specifying
    which socket function is being called; and the second is a pointer to
--- libc/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h.jj	2004-08-30 12:04:04.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/m68k/bits/fcntl.h	2005-08-18 13:37:46.000000000 +0200
@@ -91,8 +91,8 @@
 
 #ifdef __USE_GNU
 # define F_SETLEASE	1024	/* Set a lease.	 */
-# define F_GETLEASE	1025	/* Enquire what lease is active.  */
-# define F_NOTIFY	1026	/* Request notfications on a directory.	 */
+# define F_GETLEASE	1025	/* Inquire what lease is active.  */
+# define F_NOTIFY	1026	/* Request notifications on a directory.	 */
 #endif
 
 /* For F_[GET|SET]FL.  */
@@ -130,7 +130,7 @@
 # define DN_CREATE	0x00000004	/* File created.  */
 # define DN_DELETE	0x00000008	/* File removed.  */
 # define DN_RENAME	0x00000010	/* File renamed.  */
-# define DN_ATTRIB	0x00000020	/* File changed attibutes.  */
+# define DN_ATTRIB	0x00000020	/* File changed attributes.  */
 # define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
 #endif
 
--- libc/sysdeps/unix/sysv/linux/m68k/sys/procfs.h.jj	2001-07-15 17:30:50.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/m68k/sys/procfs.h	2005-08-18 13:37:46.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somewhat modelled after the file of the same name on SVR4
+/* This is somewhat modeled after the file of the same name on SVR4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  It doesn't have anything to do with the /proc file
    system, even though Linux has one.
--- libc/sysdeps/unix/sysv/linux/m68k/sysdep.h.jj	2004-10-05 09:05:00.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/m68k/sysdep.h	2005-08-18 13:37:46.000000000 +0200
@@ -45,7 +45,7 @@
    a large offset.  Therefore we must not anymore test for < 0, but test
    for a real error by making sure the value in %d0 is a real error
    number.  Linus said he will make sure the no syscall returns a value
-   in -1 .. -4095 as a valid result so we can savely test with -4095.  */
+   in -1 .. -4095 as a valid result so we can safely test with -4095.  */
 
 /* We don't want the label for the error handler to be visible in the symbol
    table when we define it here.  */
--- libc/sysdeps/unix/sysv/linux/bits/uio.h.jj	2001-07-06 06:56:14.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/bits/uio.h	2005-08-18 13:37:47.000000000 +0200
@@ -31,7 +31,7 @@
 /* Size of object which can be written atomically.
 
    This macro has different values in different kernel versions.  The
-   latest versions of ther kernel use 1024 and this is good choice.  Since
+   latest versions of the kernel use 1024 and this is good choice.  Since
    the C library implementation of readv/writev is able to emulate the
    functionality even if the currently running kernel does not support
    this large value the readv/writev call will not fail because of this.  */
--- libc/sysdeps/unix/sysv/linux/bits/local_lim.h.jj	2004-04-13 10:42:55.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/bits/local_lim.h	2005-08-18 13:37:47.000000000 +0200
@@ -51,7 +51,7 @@
 # undef __undef_OPEN_MAX
 #endif
 
-/* Maximum amount by which a process can descrease its asynchronous I/O
+/* Maximum amount by which a process can decrease its asynchronous I/O
    priority level.  */
 #define AIO_PRIO_DELTA_MAX	20
 
--- libc/sysdeps/unix/sysv/linux/bits/resource.h.jj	2005-06-23 12:15:48.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/bits/resource.h	2005-08-18 13:37:47.000000000 +0200
@@ -95,7 +95,7 @@ enum __rlimit_resource
   __RLIMIT_NICE = 13,
 #define RLIMIT_NICE __RLIMIT_NICE
 
-  /* Maximum realtime priority allowed for non-priviledged
+  /* Maximum realtime priority allowed for non-privileged
      processes.  */
   __RLIMIT_RTPRIO = 14,
 #define RLIMIT_RTPRIO __RLIMIT_RTPRIO
--- libc/sysdeps/unix/sysv/linux/init-first.c.jj	2005-01-08 16:50:29.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/init-first.c	2005-08-18 13:37:47.000000000 +0200
@@ -33,7 +33,7 @@
    used in the process.  Safe assumption if initializer never runs.  */
 int __libc_multiple_libcs attribute_hidden = 1;
 
-/* Remember the command line argument and enviroment contents for
+/* Remember the command line argument and environment contents for
    later calls of initializers for dynamic libraries.  */
 int __libc_argc attribute_hidden;
 char **__libc_argv attribute_hidden;
--- libc/sysdeps/unix/sysv/linux/ia64/clone2.S.jj	2004-12-13 09:40:02.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/ia64/clone2.S	2005-08-18 13:37:51.000000000 +0200
@@ -99,6 +99,6 @@ PSEUDO_END(__clone2)
 
 /* For now we leave __clone undefined.  This is unlikely to be a	*/
 /* problem, since at least the i386 __clone in glibc always failed	*/
-/* with a 0 sp (eventhough the kernel explicitly handled it).		*/
+/* with a 0 sp (even though the kernel explicitly handled it).		*/
 /* Thus all such calls needed to pass an explicit sp, and as a result,	*/
 /* would be unlikely to work on ia64.					*/
--- libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h.jj	2004-08-30 12:04:03.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/ia64/bits/fcntl.h	2005-08-18 13:37:47.000000000 +0200
@@ -88,8 +88,8 @@
 
 #ifdef __USE_GNU
 # define F_SETLEASE	1024	/* Set a lease.	 */
-# define F_GETLEASE	1025	/* Enquire what lease is active.  */
-# define F_NOTIFY	1026	/* Request notfications on a directory.	 */
+# define F_GETLEASE	1025	/* Inquire what lease is active.  */
+# define F_NOTIFY	1026	/* Request notifications on a directory.	 */
 #endif
 
 /* For F_[GET|SET]FL.  */
@@ -128,7 +128,7 @@
 # define DN_CREATE	0x00000004	/* File created.  */
 # define DN_DELETE	0x00000008	/* File removed.  */
 # define DN_RENAME	0x00000010	/* File renamed.  */
-# define DN_ATTRIB	0x00000020	/* File changed attibutes.  */
+# define DN_ATTRIB	0x00000020	/* File changed attributes.  */
 # define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
 #endif
 
--- libc/sysdeps/unix/sysv/linux/ia64/sys/rse.h.jj	2001-07-06 06:56:17.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/ia64/sys/rse.h	2005-08-18 13:37:47.000000000 +0200
@@ -50,7 +50,7 @@ ia64_rse_rnat_addr (unsigned long *slot_
 	return (unsigned long *) ((unsigned long) slot_addr | (0x3f << 3));
 }
 
-/* Calcuate the number of registers in the dirty partition starting at
+/* Calculate the number of registers in the dirty partition starting at
    BSPSTORE with a size of DIRTY bytes.  This isn't simply DIRTY
    divided by eight because the 64th slot is used to store ar.rnat.  */
 
--- libc/sysdeps/unix/sysv/linux/ia64/sys/procfs.h.jj	2003-11-29 10:20:18.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/ia64/sys/procfs.h	2005-08-18 13:46:25.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somehow modelled after the file of the same name on SysVr4
+/* This is somehow modeled after the file of the same name on SysVr4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  */
 
@@ -118,7 +118,7 @@ typedef gregset_t prgregset_t;
 typedef fpregset_t prfpregset_t;
 
 /* We don't have any differences between processes and threads,
-   therefore habe only ine PID type.  */
+   therefore have only one PID type.  */
 typedef __pid_t lwpid_t;
 
 
--- libc/sysdeps/unix/sysv/linux/ia64/sysdep.h.jj	2004-09-28 01:11:41.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/ia64/sysdep.h	2005-08-18 13:37:47.000000000 +0200
@@ -99,7 +99,7 @@
    a large offset.  Therefore we must not anymore test for < 0, but test
    for a real error by making sure the value in %d0 is a real error
    number.  Linus said he will make sure the no syscall returns a value
-   in -1 .. -4095 as a valid result so we can savely test with -4095.  */
+   in -1 .. -4095 as a valid result so we can safely test with -4095.  */
 
 /* We don't want the label for the error handler to be visible in the symbol
    table when we define it here.  */
--- libc/sysdeps/unix/sysv/linux/sys/epoll.h.jj	2004-01-27 15:44:26.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/sys/epoll.h	2005-08-18 13:37:47.000000000 +0200
@@ -53,9 +53,9 @@ enum EPOLL_EVENTS
 
 
 /* Valid opcodes ( "op" parameter ) to issue to epoll_ctl().  */
-#define EPOLL_CTL_ADD 1	/* Add a file decriptor to the interface.  */
-#define EPOLL_CTL_DEL 2	/* Remove a file decriptor from the interface.  */
-#define EPOLL_CTL_MOD 3	/* Change file decriptor epoll_event structure.  */
+#define EPOLL_CTL_ADD 1	/* Add a file descriptor to the interface.  */
+#define EPOLL_CTL_DEL 2	/* Remove a file descriptor from the interface.  */
+#define EPOLL_CTL_MOD 3	/* Change file descriptor epoll_event structure.  */
 
 
 typedef union epoll_data
--- libc/sysdeps/unix/sysv/linux/sys/procfs.h.jj	2001-07-06 06:56:21.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sys/procfs.h	2005-08-18 13:46:39.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somehow modelled after the file of the same name on SysVr4
+/* This is somehow modeled after the file of the same name on SysVr4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  */
 
@@ -103,7 +103,7 @@ typedef gregset_t prgregset_t;
 typedef fpregset_t prfpregset_t;
 
 /* We don't have any differences between processes and threads,
-   therefore habe only ine PID type.  */
+   therefore have only one PID type.  */
 typedef __pid_t lwpid_t;
 
 
--- libc/sysdeps/unix/sysv/linux/sys/inotify.h.jj	2005-08-17 08:16:54.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sys/inotify.h	2005-08-18 13:37:47.000000000 +0200
@@ -37,8 +37,8 @@ struct inotify_event
 #define IN_ACCESS	 0x00000001	/* File was accessed.  */
 #define IN_MODIFY	 0x00000002	/* File was modified.  */
 #define IN_ATTRIB	 0x00000004	/* Metadata changed.  */
-#define IN_CLOSE_WRITE	 0x00000008	/* Writtable file was closed.  */
-#define IN_CLOSE_NOWRITE 0x00000010	/* Unwrittable file closed.  */
+#define IN_CLOSE_WRITE	 0x00000008	/* Writable file was closed.  */
+#define IN_CLOSE_NOWRITE 0x00000010	/* Unwritable file closed.  */
 #define IN_CLOSE	 (IN_CLOSE_WRITE | IN_CLOSE_NOWRITE) /* Close.  */
 #define IN_OPEN		 0x00000020	/* File was opened.  */
 #define IN_MOVED_FROM	 0x00000040	/* File was moved from X.  */
--- libc/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h.jj	2004-08-30 12:04:02.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/hppa/bits/fcntl.h	2005-08-18 13:37:47.000000000 +0200
@@ -91,8 +91,8 @@
 
 #ifdef __USE_GNU
 # define F_SETLEASE     1024    /* Set a lease.  */
-# define F_GETLEASE     1025    /* Enquire what lease is active.  */
-# define F_NOTIFY       1026    /* Request notfications on a directory.  */
+# define F_GETLEASE     1025    /* Inquire what lease is active.  */
+# define F_NOTIFY       1026    /* Request notifications on a directory.  */
 #endif
 
 /* for F_[GET|SET]FL */
@@ -123,7 +123,7 @@
 # define DN_CREATE      0x00000004      /* File created.  */
 # define DN_DELETE      0x00000008      /* File removed.  */
 # define DN_RENAME      0x00000010      /* File renamed.  */
-# define DN_ATTRIB      0x00000020      /* File changed attibutes.  */
+# define DN_ATTRIB      0x00000020      /* File changed attributes.  */
 # define DN_MULTISHOT   0x80000000      /* Don't remove notifier.  */
 #endif
 
--- libc/sysdeps/unix/sysv/linux/hppa/bits/mman.h.jj	2003-09-30 00:23:24.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/hppa/bits/mman.h	2005-08-18 13:37:47.000000000 +0200
@@ -57,7 +57,7 @@
 #define MADV_RANDOM     1               /* expect random page references */
 #define MADV_SEQUENTIAL 2               /* expect sequential page references */
 #define MADV_WILLNEED   3               /* will need these pages */
-#define MADV_DONTNEED   4               /* dont need these pages */
+#define MADV_DONTNEED   4               /* don't need these pages */
 #define MADV_SPACEAVAIL 5               /* insure that resources are reserved */
 #define MADV_VPS_PURGE  6               /* Purge pages from VM page cache */
 #define MADV_VPS_INHERIT 7              /* Inherit parents page size */
--- libc/sysdeps/unix/sysv/linux/hppa/sys/procfs.h.jj	2001-07-06 06:56:16.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/hppa/sys/procfs.h	2005-08-18 13:37:47.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somewhat modelled after the file of the same name on SVR4
+/* This is somewhat modeled after the file of the same name on SVR4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  It doesn't have anything to do with the /proc file
    system, even though Linux has one.
--- libc/sysdeps/unix/sysv/linux/hppa/sysdep.h.jj	2003-11-04 19:33:16.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/hppa/sysdep.h	2005-08-18 13:37:47.000000000 +0200
@@ -161,7 +161,7 @@
 #define SYSCALL_PIC_SETUP	/* Nothing.  */
 
 
-/* All the syscall assembly macros rely on finding the approriate
+/* All the syscall assembly macros rely on finding the appropriate
    SYSCALL_ERROR_LABEL or rather HANDLER. */
 
 /* int * __errno_location(void) so you have to store your value
--- libc/sysdeps/unix/sysv/linux/hppa/kernel_sigaction.h.jj	2000-10-15 05:26:50.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/hppa/kernel_sigaction.h	2005-08-18 13:46:56.000000000 +0200
@@ -1,7 +1,7 @@
 /* We have a separate header file here because we do not support
    SA_RESTORER on hppa. */
 
-/* This is the sigaction struction from the Linux 2.1.20 kernel.  */
+/* This is the sigaction structure from the Linux 2.1.20 kernel.  */
 /* Blah.  This is bogus.  We don't ever use it. */
 struct old_kernel_sigaction {
 	__sighandler_t k_sa_handler;
--- libc/sysdeps/unix/sysv/linux/netax25/ax25.h.jj	2001-07-06 06:56:18.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/netax25/ax25.h	2005-08-18 13:37:47.000000000 +0200
@@ -63,7 +63,7 @@
 #define AX25_DIGI_INBAND	0x01	/* Allow digipeating within port */
 #define AX25_DIGI_XBAND		0x02	/* Allow digipeating across ports */
 
-/* Maximim number of digipeaters: */
+/* Maximum number of digipeaters: */
 #define AX25_MAX_DIGIS 8
 
 
@@ -81,7 +81,7 @@ struct sockaddr_ax25
   };
 
 /*
- * The sockaddr struct with the digipeater adresses:
+ * The sockaddr struct with the digipeater addresses:
  */
 struct full_sockaddr_ax25
   {
--- libc/sysdeps/unix/sysv/linux/x86_64/swapcontext.S.jj	2005-06-06 11:41:20.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/x86_64/swapcontext.S	2005-08-18 13:37:51.000000000 +0200
@@ -26,7 +26,7 @@
 /* int __swapcontext (ucontext_t *oucp, const ucontext_t *ucp);
 
   Saves the machine context in oucp such that when it is activated,
-  it appears as if __swapcontextt() returned again, restores the
+  it appears as if __swapcontext() returned again, restores the
   machine context in ucp and thereby resumes execution in that
   context.
 
--- libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h.jj	2004-08-30 12:04:09.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h	2005-08-18 13:37:47.000000000 +0200
@@ -106,8 +106,8 @@
 
 #ifdef __USE_GNU
 # define F_SETLEASE	1024	/* Set a lease.	 */
-# define F_GETLEASE	1025	/* Enquire what lease is active.  */
-# define F_NOTIFY	1026	/* Request notfications on a directory.	 */
+# define F_GETLEASE	1025	/* Inquire what lease is active.  */
+# define F_NOTIFY	1026	/* Request notifications on a directory.	 */
 #endif
 
 /* For F_[GET|SET]FL.  */
@@ -145,7 +145,7 @@
 # define DN_CREATE	0x00000004	/* File created.  */
 # define DN_DELETE	0x00000008	/* File removed.  */
 # define DN_RENAME	0x00000010	/* File renamed.  */
-# define DN_ATTRIB	0x00000020	/* File changed attibutes.  */
+# define DN_ATTRIB	0x00000020	/* File changed attributes.  */
 # define DN_MULTISHOT	0x80000000	/* Don't remove notifier.  */
 #endif
 
--- libc/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h.jj	2004-01-27 15:44:26.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h	2005-08-18 13:37:47.000000000 +0200
@@ -53,9 +53,9 @@ enum EPOLL_EVENTS
 
 
 /* Valid opcodes ( "op" parameter ) to issue to epoll_ctl().  */
-#define EPOLL_CTL_ADD 1	/* Add a file decriptor to the interface.  */
-#define EPOLL_CTL_DEL 2	/* Remove a file decriptor from the interface.  */
-#define EPOLL_CTL_MOD 3	/* Change file decriptor epoll_event structure.  */
+#define EPOLL_CTL_ADD 1	/* Add a file descriptor to the interface.  */
+#define EPOLL_CTL_DEL 2	/* Remove a file descriptor from the interface.  */
+#define EPOLL_CTL_MOD 3	/* Change file descriptor epoll_event structure.  */
 
 
 typedef union epoll_data
--- libc/sysdeps/unix/sysv/linux/x86_64/sys/procfs.h.jj	2004-11-09 12:26:48.000000000 +0100
+++ libc/sysdeps/unix/sysv/linux/x86_64/sys/procfs.h	2005-08-18 13:37:47.000000000 +0200
@@ -19,7 +19,7 @@
 #ifndef _SYS_PROCFS_H
 #define _SYS_PROCFS_H	1
 
-/* This is somewhat modelled after the file of the same name on SVR4
+/* This is somewhat modeled after the file of the same name on SVR4
    systems.  It provides a definition of the core file format for ELF
    used on Linux.  It doesn't have anything to do with the /proc file
    system, even though Linux has one.
--- libc/sysdeps/unix/sysv/linux/x86_64/sysdep.h.jj	2005-04-13 21:29:57.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/x86_64/sysdep.h	2005-08-18 13:37:47.000000000 +0200
@@ -63,7 +63,7 @@
    might return a large offset.	 Therefore we must not anymore test
    for < 0, but test for a real error by making sure the value in %eax
    is a real error number.  Linus said he will make sure the no syscall
-   returns a value in -1 .. -4095 as a valid result so we can savely
+   returns a value in -1 .. -4095 as a valid result so we can safely
    test with -4095.  */
 
 /* We don't want the label for the error handle to be global when we define
@@ -182,7 +182,7 @@
     The Linux kernel uses and destroys internally these registers:
     return address from
     syscall		rcx
-    additionally clobered: r12-r15,rbx,rbp
+    additionally clobbered: r12-r15,rbx,rbp
     eflags from syscall	r11
 
     Normal function call, including calls to the system call stub
--- libc/sysdeps/unix/sysv/linux/dl-osinfo.h.jj	2005-08-08 09:16:33.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/dl-osinfo.h	2005-08-18 13:37:46.000000000 +0200
@@ -152,7 +152,7 @@ _dl_discover_osversion (void)
 									      \
 	/* Now we can test with the required version.  */		      \
 	if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION)   \
-	  /* Not sufficent.  */						      \
+	  /* Not sufficient.  */						      \
 	  FATAL ("FATAL: kernel too old\n");				      \
       }									      \
     else if (__LINUX_KERNEL_VERSION > 0)				      \
--- libc/sysdeps/gnu/netinet/tcp.h.jj	2001-04-29 14:30:59.000000000 +0200
+++ libc/sysdeps/gnu/netinet/tcp.h	2005-08-18 13:37:47.000000000 +0200
@@ -64,7 +64,7 @@ struct tcphdr
     u_int16_t th_sport;		/* source port */
     u_int16_t th_dport;		/* destination port */
     tcp_seq th_seq;		/* sequence number */
-    tcp_seq th_ack;		/* acknowledgement number */
+    tcp_seq th_ack;		/* acknowledgment number */
 #  if __BYTE_ORDER == __LITTLE_ENDIAN
     u_int8_t th_x2:4;		/* (unused) */
     u_int8_t th_off:4;		/* data offset */
--- libc/sysdeps/alpha/hp-timing.h.jj	2001-09-01 08:08:44.000000000 +0200
+++ libc/sysdeps/alpha/hp-timing.h	2005-08-18 13:37:47.000000000 +0200
@@ -27,7 +27,7 @@
 
 /* The macros defined here use the timestamp counter in IA-64.  They
    provide a very accurate way to measure the time with very little
-   overhead.  The time values themself have no real meaning, only
+   overhead.  The time values themselves have no real meaning, only
    differences are interesting.
 
    The list of macros we need includes the following:
--- libc/sysdeps/alpha/fpu/bits/fenv.h.jj	2001-07-06 06:55:47.000000000 +0200
+++ libc/sysdeps/alpha/fpu/bits/fenv.h	2005-08-18 13:47:17.000000000 +0200
@@ -60,7 +60,7 @@ enum
 #define FE_ALL_EXCEPT	FE_ALL_EXCEPT
   };
 
-/* Alpha chips support all four defined rouding modes.
+/* Alpha chips support all four defined rounding modes.
 
    Note that code must be compiled to use dynamic rounding (/d) instructions
    to see these changes.  For gcc this is -mfp-rounding-mode=d; for DEC cc
--- libc/sysdeps/alpha/bits/atomic.h.jj	2004-01-27 15:44:24.000000000 +0100
+++ libc/sysdeps/alpha/bits/atomic.h	2005-08-18 13:37:47.000000000 +0200
@@ -151,7 +151,7 @@ typedef uintmax_t uatomic_max_t;
 	: "memory");							\
 })
 
-/* For all "bool" routines, we return FALSE if exchange succesful.  */
+/* For all "bool" routines, we return FALSE if exchange successful.  */
 
 #define __arch_compare_and_exchange_bool_8_int(mem, new, old, mb1, mb2)	\
 ({ unsigned long __prev; int __cmp;					\
--- libc/sysdeps/alpha/soft-fp/ots_cvtqux.c.jj	2004-03-06 21:46:23.000000000 +0100
+++ libc/sysdeps/alpha/soft-fp/ots_cvtqux.c	2005-08-18 13:37:47.000000000 +0200
@@ -22,7 +22,7 @@
 #include "local-soft-fp.h"
 
 /* Should never actually be used, since we've more bits of precision
-   than the incomming long, but needed for linkage.  */
+   than the incoming long, but needed for linkage.  */
 #undef FP_ROUNDMODE
 #define FP_ROUNDMODE  FP_RND_ZERO
 
--- libc/sysdeps/alpha/soft-fp/ots_cvtqx.c.jj	2004-03-06 21:46:23.000000000 +0100
+++ libc/sysdeps/alpha/soft-fp/ots_cvtqx.c	2005-08-18 13:37:47.000000000 +0200
@@ -22,7 +22,7 @@
 #include "local-soft-fp.h"
 
 /* Should never actually be used, since we've more bits of precision
-   than the incomming long, but needed for linkage.  */
+   than the incoming long, but needed for linkage.  */
 #undef FP_ROUNDMODE
 #define FP_ROUNDMODE  FP_RND_ZERO
 
--- libc/sysdeps/s390/s390-32/elf/setjmp.S.jj	2003-12-11 22:23:20.000000000 +0100
+++ libc/sysdeps/s390/s390-32/elf/setjmp.S	2005-08-18 13:37:51.000000000 +0200
@@ -28,20 +28,20 @@
 ENTRY (setjmp)
 	.weak C_SYMBOL_NAME (setjmp)
 	lhi    %r3,1                /* second argument of one */
-	j      .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */
+	j      .Linternal_sigsetjmp /* branch relative to __sigsetjmp */
 END (setjmp)
 
 	/* Binary compatibility entry point.  */
 ENTRY(_setjmp)
 	.weak  C_SYMBOL_NAME (_setjmp)
 	lhi    %r3,0                /* second argument of zero */
-	j      .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */
+	j      .Linternal_sigsetjmp /* branch relative to __sigsetjmp */
 END (_setjmp)
 libc_hidden_def (_setjmp)
 
 ENTRY(__setjmp)
 	lhi    %r3,0                /* second argument of zero */
-	j      .Linternal_sigsetjmp /* branch relativ to __sigsetjmp */
+	j      .Linternal_sigsetjmp /* branch relative to __sigsetjmp */
 END (__setjmp)
 
 ENTRY(__sigsetjmp)
--- libc/sysdeps/s390/s390-32/s390-mcount.S.jj	2005-06-06 11:41:12.000000000 +0200
+++ libc/sysdeps/s390/s390-32/s390-mcount.S	2005-08-18 13:37:51.000000000 +0200
@@ -1,4 +1,4 @@
-/* S/390-specific implemetation of profiling support.
+/* S/390-specific implementation of profiling support.
    Copyright (C) 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com)
--- libc/sysdeps/s390/fpu/bits/fenv.h.jj	2001-07-06 06:56:02.000000000 +0200
+++ libc/sysdeps/s390/fpu/bits/fenv.h	2005-08-18 13:37:47.000000000 +0200
@@ -36,7 +36,7 @@ enum
     FE_INEXACT = 0x08
 #define FE_INEXACT	FE_INEXACT
   };
-/* We dont use the y bit of the DXC in the floating point control register
+/* We don't use the y bit of the DXC in the floating point control register
    as glibc has no FE encoding for fe inexact incremented
    or fe inexact truncated.
    We currently  use the flag bits in the fpc
--- libc/sysdeps/s390/s390-64/s390x-mcount.S.jj	2005-06-06 11:41:12.000000000 +0200
+++ libc/sysdeps/s390/s390-64/s390x-mcount.S	2005-08-18 13:37:51.000000000 +0200
@@ -1,4 +1,4 @@
-/* 64 bit S/390-specific implemetation of profiling support.
+/* 64 bit S/390-specific implementation of profiling support.
    Copyright (C) 2001 Free Software Foundation, Inc.
    Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com)
    This file is part of the GNU C Library.
--- libc/sysdeps/s390/s390-64/elf/setjmp.S.jj	2003-12-11 22:23:20.000000000 +0100
+++ libc/sysdeps/s390/s390-64/elf/setjmp.S	2005-08-18 13:37:51.000000000 +0200
@@ -28,20 +28,20 @@
 ENTRY (setjmp)
 	.weak C_SYMBOL_NAME (setjmp)
         lghi   %r3,1                /* Second argument of one.  */
-        j      .Linternal_sigsetjmp /* Branch relativ to __sigsetjmp.  */
+        j      .Linternal_