Merge remote-tracking branch 'origin/released'

* origin/released:
  Updated to latest CVS version of pthreads

Conflicts:
	pthreads/Makefile

1 files changed, 5 insertions, 5 deletions

diff --git a/pthreads/tests/cancel6a.c b/pthreads/tests/cancel6a.c
index 58063d573..3a81eae6d 100644
--- a/pthreads/tests/cancel6a.c
+++ b/pthreads/tests/cancel6a.c
@@ -24,7 +24,7 @@
  *
  * --------------------------------------------------------------------------
  *
- * Test Synopsis: Test double cancelation - asynchronous.
+ * Test Synopsis: Test double cancellation - asynchronous.
  * Second attempt should fail (ESRCH).
  *
  * Test Method (Validation or Falsification):
@@ -100,7 +100,7 @@ mythread(void * arg)
 
   /*
    * We wait up to 10 seconds, waking every 0.1 seconds,
-   * for a cancelation to be applied to us.
+   * for a cancellation to be applied to us.
    */
   for (bag->count = 0; bag->count < 100; bag->count++)
     Sleep(100);
@@ -125,7 +125,7 @@ main()
     }
 
   /*
-   * Code to control or munipulate child threads should probably go here.
+   * Code to control or manipulate child threads should probably go here.
    */
   Sleep(500);
 
@@ -164,9 +164,9 @@ main()
       void* result = (void*)0;
 
       /*
-       * The thread does not contain any cancelation points, so
+       * The thread does not contain any cancellation points, so
        * a return value of PTHREAD_CANCELED confirms that async
-       * cancelation succeeded.
+       * cancellation succeeded.
        */
       assert(pthread_join(t[i], &result) == 0);