Typos.

diff --git a/.appveyor.yml b/.appveyor.yml
index 7ef6a30..401f8cd 100644 (file)
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -47,7 +47,7 @@ build_script:
 - mingw32-make.exe VERBOSE=1 java-all python-bindings # Only the Java and Python parts
 - ctest --output-on-failure -R java
 # Don't test python, as pybind11 seems too complex for mingw for now (mingw-w64/x86_64-7.2.0-posix-seh-rt_v5-rev1)
-# The observed failure is around the ForcefulKill exception, that seems badly catched somehow.
+# The observed failure is around the ForcefulKill exception, that seems badly caught somehow.
 # - ctest --output-on-failure -R python
 
 artifacts:

diff --git a/ChangeLog b/ChangeLog
index 5095f54..a967110 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,7 +22,7 @@ Fixed bugs (GH=GitHub; FG=FramaGit):
 
 SimGrid (3.22) April 1. 2019
 
-The Easter Chrismas Release (this one is somewhat late).
+The Easter Christmas Release (this one is somewhat late).
 
 Python:
  - We are excited to introduce the SimGrid/S4U interface to your neighborhood
@@ -3051,7 +3051,7 @@ SimGrid (3.0.1) stable; urgency=low
     the pthread backend. It caused some weird deadlock or behavior
     depending on the pthread implementation. [AL]
   * Bugfix: get the exceptions raised in the simulator repport where
-    and why they come from when they are not catched in time [AL, MQ]
+    and why they come from when they are not caught in time [AL, MQ]
 
   SURF:
   * Bugfix: Do repport the error when two non-connected hosts try to
@@ -3143,7 +3143,7 @@ SimGrid (2.96) unstable; urgency=low
   * New! Exception handling with setjmp or such (code from OSSP ex) [MQ]
     This deprecates the xbt_error_t mechanisms.
     It modifies (simplifies) all XBT and GRAS API.
-    MSG API keeps unchanged (exceptions raised by XBT are catched from
+    MSG API keeps unchanged (exceptions raised by XBT are caught from
      within MSG and masked with existing error handling facilities)
 
   SURF:

diff --git a/NEWS b/NEWS
index 144460b..7e70afe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -12,7 +12,7 @@ __   _____ _ __ ___(_) ___  _ __   |___ / |___ \|___ \
   \_/ \___|_|  |___/_|\___/|_| |_| |____(_)_____|_____|
                April 1. 2019
 
-The Easter Chrismas Release (this one is somewhat late).
+The Easter Christmas Release (this one is somewhat late).
 
  * Introducing the Python bindings (still beta)
  * Doc: SMPI tutorial and platform description ported to RTD

diff --git a/teshsuite/xbt/mmalloc/mmalloc_32.tesh b/teshsuite/xbt/mmalloc/mmalloc_32.tesh
index e40a03f..06bc543 100644 (file)
--- a/teshsuite/xbt/mmalloc/mmalloc_32.tesh
+++ b/teshsuite/xbt/mmalloc/mmalloc_32.tesh
@@ -104,7 +104,7 @@ $ ${bindir:=.}/mmalloc_test --log=root.fmt:%m%n
 > All blocks were correctly allocated. Free every second block
 > Memset every second block to zero (yeah, they are not currently allocated :)
 > Re-allocate every second block
-> free all blocks (each one twice, to check that double free are correctly catched)
-> free again all blocks (to really check that double free are correctly catched)
+> free all blocks (each one twice, to check that double free are correctly caught)
+> free again all blocks (to really check that double free are correctly caught)
 > Let's try different codepaths for mrealloc
 > Damnit, I cannot break mmalloc this time. That's SO disappointing.

diff --git a/teshsuite/xbt/mmalloc/mmalloc_64.tesh b/teshsuite/xbt/mmalloc/mmalloc_64.tesh
index 90e01ff..17356ee 100644 (file)
--- a/teshsuite/xbt/mmalloc/mmalloc_64.tesh
+++ b/teshsuite/xbt/mmalloc/mmalloc_64.tesh
@@ -104,7 +104,7 @@ $ ${bindir:=.}/mmalloc_test --log=root.fmt:%m%n
 > All blocks were correctly allocated. Free every second block
 > Memset every second block to zero (yeah, they are not currently allocated :)
 > Re-allocate every second block
-> free all blocks (each one twice, to check that double free are correctly catched)
-> free again all blocks (to really check that double free are correctly catched)
+> free all blocks (each one twice, to check that double free are correctly caught)
+> free again all blocks (to really check that double free are correctly caught)
 > Let's try different codepaths for mrealloc
 > Damnit, I cannot break mmalloc this time. That's SO disappointing.

diff --git a/teshsuite/xbt/mmalloc/mmalloc_test.cpp b/teshsuite/xbt/mmalloc/mmalloc_test.cpp
index df92cf1..e5ddf72 100644 (file)
--- a/teshsuite/xbt/mmalloc/mmalloc_test.cpp
+++ b/teshsuite/xbt/mmalloc/mmalloc_test.cpp
@@ -69,7 +69,7 @@ int main(int argc, char**argv)
     pointers[i] = mmalloc(heapA, size);
   }
 
-  XBT_INFO("free all blocks (each one twice, to check that double free are correctly catched)");
+  XBT_INFO("free all blocks (each one twice, to check that double free are correctly caught)");
   for (i = 0; i < TESTSIZE; i++) {
     bool gotit = false;
     mfree(heapA, pointers[i]);
@@ -82,7 +82,7 @@ int main(int argc, char**argv)
       xbt_die("FAIL: A double-free went undetected (for size:%d)",size_of_block(i));
   }
 
-  XBT_INFO("free again all blocks (to really check that double free are correctly catched)");
+  XBT_INFO("free again all blocks (to really check that double free are correctly caught)");
   for (i = 0; i < TESTSIZE; i++) {
     bool gotit = false;
     try {