From 4e62e76d104a17f0c9aaf9135ac605e9c8c87141 Mon Sep 17 00:00:00 2001
From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Sun, 20 Oct 2019 16:13:15 +0200
Subject: [PATCH] Spell check.

---
 ChangeLog                                     | 28 ++++----
 doc/doxygen/FAQ.doc                           |  2 +-
 doc/doxygen/module-surf.doc                   |  2 +-
 doc/doxygen/module-xbt.doc                    |  2 +-
 doc/doxygen/platform.doc                      |  4 +-
 .../deprecated/java/app/bittorrent/Peer.java  | 24 +++----
 examples/deprecated/msg/dht-kademlia/answer.h |  2 +-
 examples/platforms/cluster_multi.xml          |  2 +-
 .../optorsim/transform_optorsim_platform.pl   |  2 +-
 examples/s4u/README.rst                       |  4 +-
 .../s4u/actor-exiting/s4u-actor-exiting.cpp   |  2 +-
 .../s4u/synchro-mutex/s4u-synchro-mutex.cpp   |  2 +-
 examples/smpi/replay/replay.cpp               |  2 +-
 .../replay_multiple_manual.cpp                |  2 +-
 include/simgrid/kernel/future.hpp             | 12 ++--
 .../simgrid/kernel/routing/DijkstraZone.hpp   |  2 +-
 include/simgrid/msg.h                         |  4 +-
 include/simgrid/plugins/file_system.h         |  2 +-
 include/simgrid/s4u/Host.hpp                  |  2 +-
 include/simgrid/simix.h                       |  2 +-
 include/simgrid/simix.hpp                     | 10 +--
 include/xbt/base.h                            |  2 +-
 include/xbt/dynar.h                           |  2 +-
 include/xbt/ex.h                              |  2 +-
 include/xbt/log.h                             |  8 +--
 include/xbt/synchro.h                         |  2 +-
 sonar-project.properties                      |  2 +-
 src/bindings/java/jmsg_host.cpp               |  2 +-
 src/bindings/java/jxbt_utilities.hpp          |  2 +-
 src/bindings/java/org/simgrid/msg/Task.java   |  6 +-
 src/bindings/java/org/simgrid/msg/VM.java     |  6 +-
 src/include/xbt/mmalloc.h                     |  2 +-
 src/instr/instr_config.cpp                    |  6 +-
 src/instr/instr_interface.cpp                 |  2 +-
 src/instr/instr_private.hpp                   |  2 +-
 src/internal_config.h.in                      |  2 +-
 src/kernel/activity/CommImpl.cpp              |  2 +-
 src/kernel/activity/CommImpl.hpp              |  2 +-
 src/kernel/activity/ExecImpl.cpp              |  4 +-
 src/kernel/context/Context.hpp                |  2 +-
 src/kernel/context/ContextUnix.cpp            |  2 +-
 src/kernel/lmm/maxmin.cpp                     |  8 +--
 src/kernel/lmm/maxmin.hpp                     |  4 +-
 src/kernel/lmm/maxmin_test.cpp                |  2 +-
 src/kernel/resource/profile/DatedValue.hpp    |  2 +-
 src/kernel/routing/ClusterZone.cpp            |  2 +-
 src/kernel/routing/TorusZone.cpp              |  2 +-
 src/mc/checker/SimcallInspector.hpp           |  2 +-
 src/mc/compare.cpp                            |  6 +-
 src/mc/inspect/ObjectInformation.cpp          |  2 +-
 src/mc/inspect/ObjectInformation.hpp          |  2 +-
 src/mc/inspect/mc_unw_vmread.cpp              |  2 +-
 src/mc/mc_base.h                              |  2 +-
 src/mc/remote/RemoteClient.cpp                |  4 +-
 src/mc/sosp/PageStore.cpp                     |  2 +-
 src/mc/sosp/Region.hpp                        |  2 +-
 src/mc/sosp/Snapshot.cpp                      |  6 +-
 src/msg/msg_task.cpp                          |  4 +-
 src/plugins/file_system/s4u_FileSystem.cpp    |  4 +-
 src/plugins/host_dvfs.cpp                     |  4 +-
 src/plugins/host_energy.cpp                   |  2 +-
 src/plugins/vm/VmLiveMigration.hpp            |  3 +-
 src/s4u/s4u_Host.cpp                          |  2 +-
 src/simdag/sd_dotloader.cpp                   |  2 +-
 src/simgrid/version.h.in                      |  2 +-
 src/simix/smx_global.cpp                      |  2 +-
 src/smpi/bindings/smpi_pmpi_coll.cpp          |  2 +-
 src/smpi/bindings/smpi_pmpi_request.cpp       |  6 +-
 src/smpi/colls/allgather/allgather-2dmesh.cpp |  4 +-
 src/smpi/colls/allgather/allgather-3dmesh.cpp |  2 +-
 .../colls/allgather/allgather-NTSLR-NB.cpp    |  3 +-
 src/smpi/colls/allgather/allgather-NTSLR.cpp  |  4 +-
 src/smpi/colls/allgather/allgather-bruck.cpp  |  3 +-
 src/smpi/colls/allgather/allgather-pair.cpp   |  2 +-
 src/smpi/colls/allgather/allgather-ring.cpp   |  2 +-
 .../allgather/allgather-spreading-simple.cpp  |  2 +-
 src/smpi/colls/allgatherv/allgatherv-pair.cpp |  2 +-
 src/smpi/colls/allgatherv/allgatherv-ring.cpp |  2 +-
 src/smpi/colls/allreduce/allreduce-lr.cpp     |  2 +-
 .../colls/allreduce/allreduce-mvapich-rs.cpp  |  2 +-
 .../allreduce-ompi-ring-segmented.cpp         |  2 +-
 .../colls/allreduce/allreduce-rab-rdb.cpp     |  2 +-
 src/smpi/colls/allreduce/allreduce-rdb.cpp    |  4 +-
 .../allreduce-smp-binomial-pipeline.cpp       |  4 +-
 .../allreduce/allreduce-smp-binomial.cpp      |  3 +-
 .../colls/allreduce/allreduce-smp-rdb.cpp     |  3 +-
 src/smpi/colls/alltoall/alltoall-2dmesh.cpp   |  2 +-
 src/smpi/colls/alltoall/alltoall-3dmesh.cpp   |  2 +-
 src/smpi/colls/alltoall/alltoall-bruck.cpp    |  2 +-
 .../alltoall/alltoall-pair-light-barrier.cpp  |  2 +-
 .../alltoall/alltoall-pair-mpi-barrier.cpp    |  2 +-
 .../alltoall/alltoall-pair-one-barrier.cpp    |  2 +-
 src/smpi/colls/alltoall/alltoall-pair.cpp     |  2 +-
 src/smpi/colls/alltoall/alltoall-rdb.cpp      |  2 +-
 .../alltoall/alltoall-ring-light-barrier.cpp  |  2 +-
 .../alltoall/alltoall-ring-mpi-barrier.cpp    |  2 +-
 .../alltoall/alltoall-ring-one-barrier.cpp    |  2 +-
 src/smpi/colls/alltoall/alltoall-ring.cpp     |  2 +-
 .../alltoallv-pair-light-barrier.cpp          |  2 +-
 .../alltoallv/alltoallv-pair-mpi-barrier.cpp  |  2 +-
 .../alltoallv/alltoallv-pair-one-barrier.cpp  |  2 +-
 src/smpi/colls/alltoallv/alltoallv-pair.cpp   |  2 +-
 .../alltoallv-ring-light-barrier.cpp          |  2 +-
 .../alltoallv/alltoallv-ring-mpi-barrier.cpp  |  2 +-
 .../alltoallv/alltoallv-ring-one-barrier.cpp  |  2 +-
 src/smpi/colls/alltoallv/alltoallv-ring.cpp   |  2 +-
 src/smpi/colls/barrier/barrier-ompi.cpp       |  2 +-
 src/smpi/colls/bcast/bcast-NTSB.cpp           |  8 +--
 src/smpi/colls/bcast/bcast-binomial-tree.cpp  |  2 +-
 .../colls/bcast/bcast-ompi-split-bintree.cpp  | 67 +++++++++----------
 .../bcast/bcast-scatter-LR-allgather.cpp      |  2 +-
 src/smpi/colls/coll_tuned_topo.cpp            | 26 +++----
 src/smpi/colls/reduce/reduce-ompi.cpp         |  6 +-
 src/smpi/colls/reduce/reduce-rab.cpp          |  8 +--
 .../reduce_scatter/reduce_scatter-ompi.cpp    |  2 +-
 src/smpi/colls/smpi_mvapich2_selector.cpp     |  2 +-
 src/smpi/include/smpi_comm.hpp                |  2 +-
 src/smpi/include/smpi_datatype.hpp            |  2 +-
 src/smpi/include/smpi_file.hpp                |  2 +-
 src/smpi/internals/smpi_bench.cpp             |  2 +-
 src/smpi/internals/smpi_replay.cpp            |  2 +-
 src/smpi/mpi/smpi_comm.cpp                    |  2 +-
 src/smpi/mpi/smpi_request.cpp                 |  8 +--
 src/smpi/mpi/smpi_win.cpp                     |  7 +-
 src/smpi/smpirun.in                           |  4 +-
 src/surf/cpu_ti.hpp                           |  2 +-
 src/surf/network_cm02.cpp                     |  3 +-
 src/surf/network_cm02.hpp                     |  2 +-
 src/surf/network_ns3.cpp                      |  4 +-
 src/surf/surf_interface.hpp                   |  6 +-
 src/surf/xml/simgrid.dtd                      |  2 +-
 src/surf/xml/simgrid_dtd.c                    |  2 +-
 src/xbt/config.cpp                            |  2 +-
 src/xbt/config_test.cpp                       |  2 +-
 src/xbt/dict.cpp                              |  2 +-
 src/xbt/dict_private.h                        |  2 +-
 src/xbt/dict_test.cpp                         |  4 +-
 src/xbt/dynar.cpp                             |  4 +-
 src/xbt/dynar_test.cpp                        |  4 +-
 src/xbt/log_private.hpp                       |  2 +-
 src/xbt/mallocator.c                          |  2 +-
 src/xbt/mmalloc/mm_module.c                   |  4 +-
 src/xbt/mmalloc/mmalloc.c                     |  6 +-
 src/xbt/mmalloc/mmorecore.c                   |  2 +-
 src/xbt/mmalloc/mmprivate.h                   |  4 +-
 src/xbt/mmalloc/mrealloc.c                    |  2 +-
 src/xbt/mmalloc/swag.c                        |  4 +-
 teshsuite/mc/random-bug/random-bug.cpp        |  2 +-
 .../msg/app-bittorrent/bittorrent-peer.c      | 44 ++++++------
 .../host_on_off_processes.cpp                 |  2 +-
 teshsuite/msg/io-file-remote/io-file-remote.c |  2 +-
 .../msg/io-file-remote/io-file-remote.tesh    |  8 +--
 .../platform-properties/platform-properties.c |  2 +-
 teshsuite/s4u/listen_async/listen_async.cpp   |  2 +-
 .../platforms/bogus_disk_attachment.xml       |  2 +-
 .../generic-simcalls/generic-simcalls.cpp     |  6 +-
 teshsuite/smpi/type-hvector/type-hvector.c    |  2 +-
 teshsuite/smpi/type-vector/type-vector.c      |  2 +-
 tools/MSG_visualization/trace2fig.pl          |  6 +-
 tools/cmake/Distrib.cmake                     |  2 +-
 tools/cmake/Modules/FindPAPI.cmake            |  2 +-
 tools/internal/spell_dict.txt                 | 11 +++
 162 files changed, 332 insertions(+), 331 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8e5b8b827..d665a77279 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -61,7 +61,7 @@ SMPI:
    with smpi/comp-adjustment-file.
  - sleep events are now correctly traced/replayed.
  - Default for trace-call-location is now to use file names and not full paths.
-   To revert to previous behaviour (in case of collision of filenames), option
+   To revert to previous behavior (in case of collision of filenames), option
    "smpi/trace-call-use-absolute-path" can be set to yes.
 
 Model-Checker:
@@ -954,7 +954,7 @@ SimGrid (3.14) Released December 24. 2016
    MSG_environment_as_get_property_value().
    - Removed MSG_as_router_*propert*() functions
    - Added MSG_environment_as_set_property_value() for consistency
- * xbt heterogeneous dictionnaries (created with xbt_dict_new()).
+ * xbt heterogeneous dictionaries (created with xbt_dict_new()).
    Well, they are still there for now, but deprecated with a warning.
    Please switch to xbt_dict_new_homogeneous() before this is removed
    for real.
@@ -1685,7 +1685,7 @@ SimGrid-java (3.8.1) stable; urgency=low
  * New module: org.simgrid.msg.File (SimGrid File management functions)
  * New Module: org.simgrid.msg.VM (SimGrid interface to mimick IAAS clouds)
  * Change the meaning of Process.restart: now restart the process from
-   the begining, like MSG_process_restart in C.
+   the beginning, like MSG_process_restart in C.
  * Add Process.setAutoRestart: handling of process restart when failed
    host comes back.
  * Add Process.getProperty, Host.getProperty, Host.getProperty: allows
@@ -2322,7 +2322,7 @@ SimGrid (3.4.1) stable; urgency=low
  * Fix a bug preventing the tasks from begin garbage collected.
 
  MSG
- * Fix a bug occuring when a host involved in a communication fails.
+ * Fix a bug occurring when a host involved in a communication fails.
    This was not detected properly by the other peer involved in the
    communication. Now, it's reported as a network error.
 
@@ -2446,7 +2446,7 @@ SimGrid (3.4) stable; urgency=low
     o network_model -> network/model
     o workstation_model -> workstation/model
   * New configuration variables:
-    o network/bandwidth_factor: correction to bandwith
+    o network/bandwidth_factor: correction to bandwidth
     o network/latency_factor: correction to latency
     o netwotk/weight_S: correction to the weight of competing streams
   * Add a long description to the models, that users can see with such
@@ -2565,7 +2565,7 @@ SimGrid (3.3.4) stable; urgency=low
     - SD_task_create_comm_e2e() for end-to-end communication
     - SD_task_create_comp_seq() for sequential computation
    Use SD_task_schedulev() / SD_task_schedulel() to schedule them.
- * new function SD_task_dump() for debuging display
+ * new function SD_task_dump() for debugging display
  * new function SD_task_dotty(task,FILE*) writing to file the info
    about the task in dotty format
  * SD_task_dependency_exists() can now cope with having one of its
@@ -2823,7 +2823,7 @@ SimGrid (3.3.1) stable; urgency=low
      kind of action while the second one parses a trace file and
      triggers the corresponding actions within the system.
     For now, only a toy example is provided in examples/msg/actions
-  * Add an exemple of process migration in examples/msg/migration
+  * Add an example of process migration in examples/msg/migration
   * Fix a bug in task exchange which broke MSG_task_get_sender()
     Add a teshsuite regression test for that.
     [Bug: if MSG_task_get_sender() is called after sender exit,
@@ -2921,7 +2921,7 @@ SimGrid (3.3) stable; urgency=high
     **************************************
     *DO NOT MIX 3.2 RESULTS WITH 3.3 ONES* Simix may changes simulations!
     **************************************
-    The point is that events occuring at the exact same timestamp are
+    The point is that events occurring at the exact same timestamp are
     not scheduled in the same order with the old and new version. This
     may be enough to completely change the execution of simulations in
     some cases. Sorry for the inconvenience.
@@ -3098,7 +3098,7 @@ SimGrid (3.2) stable; urgency=high
          . Lesson 8: Handling errors through exceptions
          . Lesson 9: Exchanging simple data
          . Lesson 10: Remote Procedure Calling (RPC)
-         . Lesson 11: Explicitely waiting for messages
+         . Lesson 11: Explicitly waiting for messages
          . Recapping of message passing features in GRAS
      - A HOWTO section containing:
        o HOWTO design a GRAS application
@@ -3191,7 +3191,7 @@ SimGrid (3.1) stable; urgency=high
     in progress and the API is not considered to be frozen yet). [AL]
   * Display more information on backtraces: source line & function names are
     now displayed just like valgrind does (rely on addr2line tool) [MQ]
-  * New function: xbt_backtrace_display(). Sweet while debuging [MQ]
+  * New function: xbt_backtrace_display(). Sweet while debugging [MQ]
   * Reworked a little bit some #include statements to load only required
     headers. Some user code that relied on SimGrid to include stdlib or
     stdio may need to include it by themselves. [AL]
@@ -3274,7 +3274,7 @@ SimGrid (3.0.1) stable; urgency=low
      - reduces the amount of exchanged data (the size)
      - allows to retrieve all arrived data on receiver side, if we don't need
        it right now (subsequent read will peek the buffer)
-     - allows the receiver to proceed with the begining of the stream before
+     - allows the receiver to proceed with the beginning of the stream before
        everything is arrived
      - make it possible to build an iov transport (using readv/writev)
     Extra difficulty:
@@ -3688,7 +3688,7 @@ SimGrid (2.90) unstable; urgency=low
       - s_toto   is a structure needing 'struct' keyword to be used
       - e_toto_t is an enum
       -   toto_t is an 'object' (struct*)
-    Exemple:
+    Example:
       typedef struct s_toto {} s_toto_t, *toto_t;
       typedef enum {} e_toto_t;
     Moreover, only toto_t (and e_toto_t) are public. The rest (mainly
@@ -3814,7 +3814,7 @@ SimGrid (2.90) unstable; urgency=low
   - In composed data description (struct, ref and so on), stop foolness of
     keeping the subtype's ID, but store the type itself. This keeps sets out
     of the critical path, which is good since they rely on dynar and
-    dictionnaries. The only loose of that is that we cannot detect the
+    dictionaries. The only loose of that is that we cannot detect the
     redeclaration of a structure/union with another content (but I'm not sure
     the code detected well this error before anyway). We still can detect
     the redefinition discrepancy for the other types.
@@ -4052,7 +4052,7 @@ SimGrid (2.90) unstable; urgency=low
     for now.
  [Transport]
    [File plugin]
-     - Bugfix when using a filename explicitely (instead of '-')
+     - Bugfix when using a filename explicitly (instead of '-')
 
 2004-04-09 Martin Quinson
  [Transport plugins]
diff --git a/doc/doxygen/FAQ.doc b/doc/doxygen/FAQ.doc
index 3ab02afe5b..2509ee9f1d 100644
--- a/doc/doxygen/FAQ.doc
+++ b/doc/doxygen/FAQ.doc
@@ -256,7 +256,7 @@ from MBytes, MFlops and seconds to Bytes, Flops and seconds to ease
 people exchanging small messages. We also reworked the route
 descriptions to allow more compact descriptions.
 
-That is why the XML files are versionned using the 'version' attribute
+That is why the XML files are versioned using the 'version' attribute
 of the root tag. Currently, it should read:
 @verbatim
   <platform version="4">
diff --git a/doc/doxygen/module-surf.doc b/doc/doxygen/module-surf.doc
index d041a49bf3..9dc285ede3 100644
--- a/doc/doxygen/module-surf.doc
+++ b/doc/doxygen/module-surf.doc
@@ -56,7 +56,7 @@
     Some functions of the @ref SURF_host_interface and similar can give
     you some information about:
 	- a host: get_speed(), get_available_speed();
-	- a network link: get_link_name(), get_link_latency(), get_link_bandwith();
+	- a network link: get_link_name(), get_link_latency(), get_link_bandwidth();
 	- a route: get_route(), get_route_size().
 
     During the simulation, call @a surf_host_model->execute() to schedule a
diff --git a/doc/doxygen/module-xbt.doc b/doc/doxygen/module-xbt.doc
index 2c3e4b44bd..b43ac117c2 100644
--- a/doc/doxygen/module-xbt.doc
+++ b/doc/doxygen/module-xbt.doc
@@ -59,7 +59,7 @@
 
   @{ */
      /** @defgroup XBT_dynar  Dynar: generic dynamic array */
-     /** @defgroup XBT_dict   Dict: generic dictionnary */
+     /** @defgroup XBT_dict   Dict: generic dictionary */
 /** @} */
 
 
diff --git a/doc/doxygen/platform.doc b/doc/doxygen/platform.doc
index ec3781f11a..1b9d7994ec 100644
--- a/doc/doxygen/platform.doc
+++ b/doc/doxygen/platform.doc
@@ -541,7 +541,7 @@ to choose the best routing model is given in the Section called @"@ref pf_routin
 | @ref pf_routing_model_dijkstra "Dijkstra"           | Dijkstra routing data. Calculates routes only when needed                  |
 | @ref pf_routing_model_dijkstracache "DijkstraCache" | Dijkstra routing data. Handles some cache for already calculated routes.   |
 
-All those shortest-path models are instanciated in the same way and are
+All those shortest-path models are instantiated in the same way and are
 completely interchangeable. Here are some examples:
 
 @anchor pf_routing_model_floyd
@@ -1100,7 +1100,7 @@ ongoing attempt</a> to automatically extract the SimGrid platform from
 the <a href="http://grid5000.fr/">Grid'5000</a> experimental platform.
 But it's hard to come up with generic models. Don't take these files
 too seriously. Actually, you should always challenge our models and
-your instanciation if the accuracy really matters to you (see <a
+your instantiation if the accuracy really matters to you (see <a
 href="https://hal.inria.fr/hal-00907887">this discussion</a>).
 
 But such advices only hold if you have a real platform and a real
diff --git a/examples/deprecated/java/app/bittorrent/Peer.java b/examples/deprecated/java/app/bittorrent/Peer.java
index 17ba118ae2..d72b3d0ffd 100644
--- a/examples/deprecated/java/app/bittorrent/Peer.java
+++ b/examples/deprecated/java/app/bittorrent/Peer.java
@@ -407,14 +407,14 @@ public class Peer extends Process {
       sendChoked(peerChoked.mailbox);
       activePeers.remove(e.getKey());
     }
-    Connection peerChoosed = null;
+    Connection peerChosen = null;
     //Separate the case from when the peer is seeding.
     if (pieces == Common.FILE_PIECES) {
       //Find the last unchoked peer.
       double unchokeTime = deadline + 1;
       for (Connection connection : peers.values()) {
         if (connection.lastUnchoke < unchokeTime && connection.interested) {
-          peerChoosed = connection;
+          peerChosen = connection;
           unchokeTime = connection.lastUnchoke;
         }
       }
@@ -427,16 +427,16 @@ public class Peer extends Process {
           int idChosen = rand.nextInt(peers.size());
           for (Connection connection : peers.values()) {
             if (i == idChosen) {
-              peerChoosed = connection;
+              peerChosen = connection;
               break;
             }
             i++;
           } //TODO: Not really the best way ever
-          if (peerChoosed != null && !peerChoosed.interested) {
-            peerChoosed = null;
+          if (peerChosen != null && !peerChosen.interested) {
+            peerChosen = null;
           }
           j++;
-        } while (peerChoosed == null && j < Common.MAXIMUM_PEERS);
+        } while (peerChosen == null && j < Common.MAXIMUM_PEERS);
       } else {
         Connection fastest = null;
         double fastestSpeed = 0;
@@ -446,14 +446,14 @@ public class Peer extends Process {
             fastestSpeed = c.peerSpeed;
           }
         }
-        peerChoosed = fastest;
+        peerChosen = fastest;
       }
     }
-    if (peerChoosed != null) {
-      activePeers.put(peerChoosed.id,peerChoosed);
-      peerChoosed.chokedUpload = false;
-      peerChoosed.lastUnchoke = Msg.getClock();
-      sendUnchoked(peerChoosed.mailbox);
+    if (peerChosen != null) {
+      activePeers.put(peerChosen.id,peerChosen);
+      peerChosen.chokedUpload = false;
+      peerChosen.lastUnchoke = Msg.getClock();
+      sendUnchoked(peerChosen.mailbox);
     }
   }
 
diff --git a/examples/deprecated/msg/dht-kademlia/answer.h b/examples/deprecated/msg/dht-kademlia/answer.h
index bba5625b3d..e67bd62c7e 100644
--- a/examples/deprecated/msg/dht-kademlia/answer.h
+++ b/examples/deprecated/msg/dht-kademlia/answer.h
@@ -9,7 +9,7 @@
 #include <xbt/dynar.h>
 #include "routing_table.h"
 
-/* Node query anwser. contains the elements closest to the id given. */
+/* Node query answer. contains the elements closest to the id given. */
 typedef struct s_node_answer {
   unsigned int destination_id;
   xbt_dynar_t nodes;            //Dynar of node_contact_t
diff --git a/examples/platforms/cluster_multi.xml b/examples/platforms/cluster_multi.xml
index efaf30b0b6..6f014fc31b 100644
--- a/examples/platforms/cluster_multi.xml
+++ b/examples/platforms/cluster_multi.xml
@@ -65,7 +65,7 @@
     - 
     -  This models the big links constituting the backbone of the internet, 
     -  that users cannot saturate. 
-    -  Users' bandwidth is mostly limited by their outgoing connexion,
+    -  Users' bandwidth is mostly limited by their outgoing connection,
     -  not by the network backbone.
     -->
 
diff --git a/examples/platforms/optorsim/transform_optorsim_platform.pl b/examples/platforms/optorsim/transform_optorsim_platform.pl
index cb7b75cfac..8273b04cbe 100644
--- a/examples/platforms/optorsim/transform_optorsim_platform.pl
+++ b/examples/platforms/optorsim/transform_optorsim_platform.pl
@@ -19,7 +19,7 @@ open FILE, $conf_file or die "Unable to open $conf_file";
 
 print "<!-- This platform was automatically converted from the OptorSim platform.\n";
 print "\n";
-print "  OptorSim files only describes information of the cluster interconnexion.\n";
+print "  OptorSim files only describes information of the cluster interconnection.\n";
 print "  In a sense, it reflects the topology of a National Research and Education\n";
 print "  Network (NREN), but not of a full-fledged computational platform.\n";
 print "  The caracteristics of each cluster have been artificially added.\n";
diff --git a/examples/s4u/README.rst b/examples/s4u/README.rst
index 027d3b84ef..e8bd8555df 100644
--- a/examples/s4u/README.rst
+++ b/examples/s4u/README.rst
@@ -198,7 +198,7 @@ Executions on the CPU
 
   - **Basic execution:**
     The computations done in your program are not reported to the
-    simulated world, unless you explicitely request the simulator to pause
+    simulated world, unless you explicitly request the simulator to pause
     the actor until a given amount of flops gets computed on its simulated
     host. Some executions can be given an higher priority so that they
     get more resources.
@@ -326,7 +326,7 @@ Energy Simulation
     This platform file contains the energy profile of each links and
     hosts, which is necessary to get energy consumption predictions.
     As usual, you should not trust our example, and you should strive
-    to double-check that your instanciation matches your target platform.
+    to double-check that your instantiation matches your target platform.
     |br| `examples/platforms/energy_platform.xml <https://framagit.org/simgrid/simgrid/tree/master/examples/platforms/energy_platform.xml>`_
 
   - **Consumption due to the CPU:** 
diff --git a/examples/s4u/actor-exiting/s4u-actor-exiting.cpp b/examples/s4u/actor-exiting/s4u-actor-exiting.cpp
index 554ebd241c..cc7e9f6a4c 100644
--- a/examples/s4u/actor-exiting/s4u-actor-exiting.cpp
+++ b/examples/s4u/actor-exiting/s4u-actor-exiting.cpp
@@ -19,7 +19,7 @@
  * function in the Actor::on_termination signal, that is shared between
  * all actors. Callbacks to this signal are executed for each terminating
  * actors, no matter what. This is useful in many cases, in particular
- * when developping SimGrid plugins.
+ * when developing SimGrid plugins.
  *
  * Finally, you can attach callbacks to the Actor::on_destruction signal.
  * It is also shared between all actors, and gets fired when the actors
diff --git a/examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp b/examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp
index e7819f7b53..f51881790a 100644
--- a/examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp
+++ b/examples/s4u/synchro-mutex/s4u-synchro-mutex.cpp
@@ -17,7 +17,7 @@ static void worker(simgrid::s4u::MutexPtr mutex, int& result)
   mutex->lock();
 
   XBT_INFO("Hello s4u, I'm ready to compute after a regular lock");
-  // And finaly add it to the results
+  // And finally add it to the results
   result += 1;
   XBT_INFO("I'm done, good bye");
 
diff --git a/examples/smpi/replay/replay.cpp b/examples/smpi/replay/replay.cpp
index d1107d24b2..429a3a26a3 100644
--- a/examples/smpi/replay/replay.cpp
+++ b/examples/smpi/replay/replay.cpp
@@ -23,7 +23,7 @@ static void action_blah(simgrid::xbt::ReplayAction& /*args*/)
 action_fun previous_send;
 static void overriding_send(simgrid::xbt::ReplayAction& args)
 {
-  previous_send(args); // Just call the overriden symbol. That's a toy example.
+  previous_send(args); // Just call the overridden symbol. That's a toy example.
 }
 
 int main(int argc, char* argv[])
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp
index 4d4d00ee96..8524a1a53c 100644
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual.cpp
@@ -14,7 +14,7 @@
       This is done to avoid SMPI actors to start at actor_id=0.
    3. For each job:
         1. Sleep until job's starting time is reached (if needed)
-        2. Launch the replay of the corresponding time-indepent trace.
+        2. Launch the replay of the corresponding time-independent trace.
         3. Create inter-process noise, by spawning useless actors.
    4. Wait for completion (via s4u::Engine's run method)
 */
diff --git a/include/simgrid/kernel/future.hpp b/include/simgrid/kernel/future.hpp
index 71e87abc5c..7b2941e583 100644
--- a/include/simgrid/kernel/future.hpp
+++ b/include/simgrid/kernel/future.hpp
@@ -103,7 +103,7 @@ protected:
     status_ = FutureStatus::ready;
     if (continuation_) {
       // We unregister the continuation before executing it.
-      // We need to do this becase the current implementation of the
+      // We need to do this because the current implementation of the
       // continuation has a shared_ptr to the FutureState.
       auto continuation = std::move(continuation_);
       this->schedule(std::move(continuation));
@@ -135,7 +135,7 @@ private:
 /** Shared state for future and promises
  *
  *  You are not expected to use them directly but to create them
- *  implicitely through a @ref simgrid::kernel::Promise.
+ *  implicitly through a @ref simgrid::kernel::Promise.
  *  Alternatively kernel operations could inherit or contain FutureState
  *  if they are managed with std::shared_ptr.
  **/
@@ -222,11 +222,11 @@ template <class T> Future<T> unwrap_future(Future<Future<T>> future);
 /** Result of some (probably) asynchronous operation in the SimGrid kernel
  *
  * @ref simgrid::simix::Future and @ref simgrid::simix::Future provide an
- * abstration for asynchronous stuff happening in the SimGrid kernel. They
+ * abstraction for asynchronous stuff happening in the SimGrid kernel. They
  * are based on C++1z futures.
  *
  * The future represents a value which will be available at some point when this
- * asynchronous operaiont is finished. Alternatively, if this operations fails,
+ * asynchronous operation is finished. Alternatively, if this operations fails,
  * the result of the operation might be an exception.
  *
  *  As the operation is possibly no terminated yet, we cannot get the result
@@ -268,7 +268,7 @@ template <class T> Future<T> unwrap_future(Future<Future<T>> future);
  *  * inside the `.then()`, `.get()` can be used;
  *
  *  * `.get()` can only be used when `.is_ready()` (as everything happens in
- *     a single-thread, the future would be guaranted to deadlock if `.get()`
+ *     a single-thread, the future would be guaranteed to deadlock if `.get()`
  *     is called when the future is not ready);
  *
  *  * there is no future chaining support for now (`.then().then()`);
@@ -433,7 +433,7 @@ template <class T> Future<T> unwrap_future(Future<Future<T>> future)
  *      promise.set_value(value);
  *    }
  *    catch (...) {
- *      // If an error occured, we can set an exception which
+ *      // If an error occurred, we can set an exception which
  *      // will be thrown by future.get():
  *      promise.set_exception(std::current_exception());
  *    }
diff --git a/include/simgrid/kernel/routing/DijkstraZone.hpp b/include/simgrid/kernel/routing/DijkstraZone.hpp
index 279bf5cbc1..c7a2cc8494 100644
--- a/include/simgrid/kernel/routing/DijkstraZone.hpp
+++ b/include/simgrid/kernel/routing/DijkstraZone.hpp
@@ -14,7 +14,7 @@ namespace kernel {
 namespace routing {
 
 /** @ingroup ROUTING_API
- *  @brief NetZone with an explicit routing computed on need with Dijsktra
+ *  @brief NetZone with an explicit routing computed on need with Dijkstra
  *
  *  The path between components is computed each time you request it,
  *  using the Dijkstra algorithm. A cache can be used to reduce the computation.
diff --git a/include/simgrid/msg.h b/include/simgrid/msg.h
index b3f49b091d..7b2ce4a5bc 100644
--- a/include/simgrid/msg.h
+++ b/include/simgrid/msg.h
@@ -215,7 +215,7 @@ XBT_PUBLIC void MSG_process_auto_restart_set(msg_process_t process, int auto_res
  * SimGrid simulations run until all non-daemon processes are stopped.
  */
 XBT_PUBLIC void MSG_process_daemonize(msg_process_t process);
-/** @brief Imediately changes the host on which this process runs */
+/** @brief Immediately changes the host on which this process runs */
 XBT_PUBLIC void MSG_process_migrate(msg_process_t process, msg_host_t host);
 /** @brief Wait for the completion of a process.
  *
@@ -424,7 +424,7 @@ XBT_PUBLIC int MSG_sem_would_block(msg_sem_t sem);
 
 /** @brief Opaque type representing a barrier identifier */
 typedef sg_bar_t msg_bar_t;
-/** @brief Initializes a barier, with count elements */
+/** @brief Initializes a barrier, with count elements */
 XBT_PUBLIC msg_bar_t MSG_barrier_init(unsigned int count);
 /** @brief Destroys barrier */
 XBT_PUBLIC void MSG_barrier_destroy(msg_bar_t bar);
diff --git a/include/simgrid/plugins/file_system.h b/include/simgrid/plugins/file_system.h
index feb2a74b16..d33ac817c6 100644
--- a/include/simgrid/plugins/file_system.h
+++ b/include/simgrid/plugins/file_system.h
@@ -93,7 +93,7 @@ namespace s4u {
  *
  * They are located on @ref simgrid::s4u::Storage that are accessed from a given @ref simgrid::s4u::Host through
  * mountpoints.
- * For now, you cannot change the mountpoints programatically, and must declare them from your platform file.
+ * For now, you cannot change the mountpoints programmatically, and must declare them from your platform file.
  */
 class XBT_PUBLIC File {
 public:
diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp
index b066d36c54..f9f856afc9 100644
--- a/include/simgrid/s4u/Host.hpp
+++ b/include/simgrid/s4u/Host.hpp
@@ -121,7 +121,7 @@ public:
 
   /** Get an associative list [mount point]->[Storage] of all local mount points.
    *
-   *  This is defined in the platform file, and cannot be modified programatically (yet).
+   *  This is defined in the platform file, and cannot be modified programmatically (yet).
    */
   std::unordered_map<std::string, Storage*> const& get_mounted_storages();
 
diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h
index d40ac53d3d..fa670568ec 100644
--- a/include/simgrid/simix.h
+++ b/include/simgrid/simix.h
@@ -162,7 +162,7 @@ XBT_ATTRIB_DEPRECATED_v328("Please use Actor::join()") XBT_PUBLIC
 XBT_PUBLIC e_smx_state_t simcall_process_sleep(double duration);
 SG_END_DECL()
 
-/************************** Comunication simcalls *****************************/
+/************************** Communication simcalls ****************************/
 
 #ifdef __cplusplus
 XBT_PUBLIC void simcall_comm_send(smx_actor_t sender, smx_mailbox_t mbox, double task_size, double rate, void* src_buff,
diff --git a/include/simgrid/simix.hpp b/include/simgrid/simix.hpp
index 3fda606f86..6e17fd6ebc 100644
--- a/include/simgrid/simix.hpp
+++ b/include/simgrid/simix.hpp
@@ -34,8 +34,8 @@ namespace actor {
  *
  * It is highly inspired from the syscalls in a regular operating system, allowing the user code to get some specific
  * code executed in the kernel context. But here, there is almost no security involved. Parameters get checked for
- * finitness but that's all. The main goal remain to ensure reproductible ordering of uncomparable events (in [parallel]
- * simulation) and observability of events (in model-checking).
+ * finiteness but that's all. The main goal remain to ensure reproducible ordering of uncomparable events (in
+ * [parallel] simulation) and observability of events (in model-checking).
  *
  * The code passed as argument is supposed to terminate at the exact same simulated timestamp.
  * Do not use it if your code may block waiting for a subsequent event, e.g. if you lock a mutex,
@@ -45,7 +45,7 @@ namespace actor {
 template <class F> typename std::result_of<F()>::type simcall(F&& code, mc::SimcallInspector* t = nullptr)
 {
   // If we are in the maestro, we take the fast path and execute the
-  // code directly without simcall mashalling/unmarshalling/dispatch:
+  // code directly without simcall marshalling/unmarshalling/dispatch:
   if (SIMIX_is_maestro())
     return std::forward<F>(code)();
 
@@ -61,7 +61,7 @@ template <class F> typename std::result_of<F()>::type simcall(F&& code, mc::Simc
 /** Execute some code (that does not return immediately) in kernel context
  *
  * This is very similar to simcall() right above, but the calling actor will not get rescheduled until
- * actor->simcall_answer() is called explicitely.
+ * actor->simcall_answer() is called explicitly.
  *
  * Since the return value does not come from the lambda directly, its type cannot be guessed automatically and must
  * be provided as template parameter.
@@ -78,7 +78,7 @@ template <class F> typename std::result_of<F()>::type simcall(F&& code, mc::Simc
 template <class R, class F> R simcall_blocking(F&& code, mc::SimcallInspector* t = nullptr)
 {
   // If we are in the maestro, we take the fast path and execute the
-  // code directly without simcall mashalling/unmarshalling/dispatch:
+  // code directly without simcall marshalling/unmarshalling/dispatch:
   if (SIMIX_is_maestro())
     return std::forward<F>(code)();
 
diff --git a/include/xbt/base.h b/include/xbt/base.h
index 74d1176494..04ab9f3f5f 100644
--- a/include/xbt/base.h
+++ b/include/xbt/base.h
@@ -13,7 +13,7 @@
 #  define _GNU_SOURCE
 #endif
 
-// Teach the compiler that some code path is unreacheable:
+// Teach the compiler that some code path is unreachable:
 #if defined(__has_builtin)
 #  if __has_builtin(__builtin_unreachable)
 #    define XBT_UNREACHABLE() __builtin_unreachable()
diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h
index 9df2eca0b5..7891732963 100644
--- a/include/xbt/dynar.h
+++ b/include/xbt/dynar.h
@@ -20,7 +20,7 @@ SG_BEGIN_DECL()
  *
  * These are the SimGrid version of the dynamically size arrays, which all C programmer recode one day or another.
  *
- * For performance concerns, the content of DynArr must be homogeneous (in contrary to dictionnaries -- see the
+ * For performance concerns, the content of DynArr must be homogeneous (in contrary to dictionaries -- see the
  * @ref XBT_dict section). You thus have to provide the function which will be used to free the content at
  * structure creation (of type void_f_pvoid_t).
  *
diff --git a/include/xbt/ex.h b/include/xbt/ex.h
index dc31878207..f598781deb 100644
--- a/include/xbt/ex.h
+++ b/include/xbt/ex.h
@@ -16,7 +16,7 @@
 /** @addtogroup XBT_ex_c
  *  @brief Exceptions support (C)
  *
- *  Those fonctions are used to throw C++ exceptions from C code. This feature
+ *  Those functions are used to throw C++ exceptions from C code. This feature
  *  should probably be removed in the future because C and exception do not
  *  exactly play nicely together.
  */
diff --git a/include/xbt/log.h b/include/xbt/log.h
index 1df2b5c3b3..6261dfcdc3 100644
--- a/include/xbt/log.h
+++ b/include/xbt/log.h
@@ -260,7 +260,7 @@ struct xbt_log_event_s {
  * @param cat the category (not only its name, but the variable)
  * @param thresholdPriority the priority
  *
- * Programatically alters a category's threshold priority (don't use).
+ * Programmatically alters a category's threshold priority (don't use).
  */
 XBT_PUBLIC void xbt_log_threshold_set(xbt_log_category_t cat, e_xbt_log_priority_t thresholdPriority);
 
@@ -269,7 +269,7 @@ XBT_PUBLIC void xbt_log_threshold_set(xbt_log_category_t cat, e_xbt_log_priority
  * @param cat the category (not only its name, but the variable)
  * @param app the appender
  *
- * Programatically sets the category's appender. (the preferred interface is through xbt_log_control_set())
+ * Programmatically sets the category's appender. (the preferred interface is through xbt_log_control_set())
  */
 XBT_PUBLIC void xbt_log_appender_set(xbt_log_category_t cat, xbt_log_appender_t app);
 /**
@@ -277,7 +277,7 @@ XBT_PUBLIC void xbt_log_appender_set(xbt_log_category_t cat, xbt_log_appender_t
  * @param cat the category (not only its name, but the variable)
  * @param lay the layout
  *
- * Programatically sets the category's layout. (the preferred interface is through xbt_log_control_set())
+ * Programmatically sets the category's layout. (the preferred interface is through xbt_log_control_set())
  */
 XBT_PUBLIC void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay);
 
@@ -286,7 +286,7 @@ XBT_PUBLIC void xbt_log_layout_set(xbt_log_category_t cat, xbt_log_layout_t lay)
  * @param cat the category (not only its name, but the variable)
  * @param additivity whether logging actions must be passed to parent.
  *
- * Programatically sets whether the logging actions must be passed to the parent category.
+ * Programmatically sets whether the logging actions must be passed to the parent category.
  * (the preferred interface is through xbt_log_control_set())
  */
 XBT_PUBLIC void xbt_log_additivity_set(xbt_log_category_t cat, int additivity);
diff --git a/include/xbt/synchro.h b/include/xbt/synchro.h
index 1be5b5fa75..5648131ee3 100644
--- a/include/xbt/synchro.h
+++ b/include/xbt/synchro.h
@@ -50,7 +50,7 @@ XBT_ATTRIB_DEPRECATED_v328("Please use sg_mutex_try_lock") XBT_PUBLIC int xbt_mu
 /** @brief Releases the given mutex variable */
 XBT_ATTRIB_DEPRECATED_v328("Please use sg_mutex_unlock") XBT_PUBLIC void xbt_mutex_release(xbt_mutex_t mutex);
 
-/** @brief Destroyes the given mutex variable */
+/** @brief Destroys the given mutex variable */
 XBT_ATTRIB_DEPRECATED_v328("Please use sg_mutex_destroy") XBT_PUBLIC void xbt_mutex_destroy(xbt_mutex_t mutex);
 
 /** @brief Thread condition data type (opaque object)
diff --git a/sonar-project.properties b/sonar-project.properties
index 4d3c444092..5ea8aa1b0b 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -16,7 +16,7 @@ sonar.sources=src,examples,include,teshsuite
 # Disable some rules on some files
 sonar.issue.ignore.multicriteria=j1,j2,j3,j4,j5,jni1,jni2,c1,c2a,c2b,c3,c4a,c4b,c5a,c5b,c6a,c6b,c7,c8,c9,c10,f1,p1,s1,s2,s3,s4
 
-# The Object.finalize() method should not be overriden
+# The Object.finalize() method should not be overridden
 # But we need to clean the native memory with JNI
 sonar.issue.ignore.multicriteria.j1.ruleKey=squid:ObjectFinalizeOverridenCheck
 sonar.issue.ignore.multicriteria.j1.resourceKey=**/*.java
diff --git a/src/bindings/java/jmsg_host.cpp b/src/bindings/java/jmsg_host.cpp
index 550c172ec5..cea9d2230a 100644
--- a/src/bindings/java/jmsg_host.cpp
+++ b/src/bindings/java/jmsg_host.cpp
@@ -108,7 +108,7 @@ JNIEXPORT jobject JNICALL Java_org_simgrid_msg_Host_currentHost(JNIEnv * env, jc
   if (not host->extension(JAVA_HOST_LEVEL)) {
     /* the native host not yet associated with the java host instance */
 
-    /* instanciate a new java host instance */
+    /* instantiate a new java host instance */
     jhost = jhost_new_instance(env);
 
     if (not jhost) {
diff --git a/src/bindings/java/jxbt_utilities.hpp b/src/bindings/java/jxbt_utilities.hpp
index 48b1e70952..aa6495beac 100644
--- a/src/bindings/java/jxbt_utilities.hpp
+++ b/src/bindings/java/jxbt_utilities.hpp
@@ -63,7 +63,7 @@ void jxbt_throw_illegal(JNIEnv* env, const std::string& msg);
 void jxbt_throw_host_not_found(JNIEnv* env, const std::string& invalid_name);
 /** Thrown when looking for a host from name does not lead to anything */
 void jxbt_throw_process_not_found(JNIEnv* env, const std::string& invalid_name);
-/** Thrown when a transfer failure accure while Sending task */
+/** Thrown when a transfer failure occurs while Sending task */
 void jxbt_throw_transfer_failure(JNIEnv* env, const std::string& detail);
 /** Thrown when a host failure occurs while Sending a task*/
 void jxbt_throw_host_failure(JNIEnv* env, const std::string& details);
diff --git a/src/bindings/java/org/simgrid/msg/Task.java b/src/bindings/java/org/simgrid/msg/Task.java
index 5bb5d2911b..033ba6eb4d 100644
--- a/src/bindings/java/org/simgrid/msg/Task.java
+++ b/src/bindings/java/org/simgrid/msg/Task.java
@@ -44,7 +44,7 @@ public class Task {
 	 *				This value has to be &ge; 0.
 	 *
 	 * @param bytesAmount		A value of amount of data (in bytes) needed to transfert this task.
-	 *				If 0, then it cannot be transfered with the get() and put() methods.
+	 *				If 0, then it cannot be transferred with the get() and put() methods.
 	 *				This value has to be &ge; 0.
 	 */
 	public Task(String name, double flopsAmount, double bytesAmount) {
@@ -94,8 +94,8 @@ public class Task {
 	 *                        to process the task. If 0, then it cannot be executed
 	 *                        with the execute() method. This value has to be >= 0.
 	 * @param bytesAmount        A value of amount of data (in bytes) needed to transfert
-	 *                        this task. If 0, then it cannot be transfered this task.
-	 *                        If 0, then it cannot be transfered with the get() and put()
+	 *                        this task. If 0, then it cannot be transferred this task.
+	 *                        If 0, then it cannot be transferred with the get() and put()
 	 *                        methods. This value has to be >= 0.
 	 * @exception             IllegalArgumentException if compute duration <0 or message size <0
 	 */
diff --git a/src/bindings/java/org/simgrid/msg/VM.java b/src/bindings/java/org/simgrid/msg/VM.java
index f0a778b9a3..8ab6a27718 100644
--- a/src/bindings/java/org/simgrid/msg/VM.java
+++ b/src/bindings/java/org/simgrid/msg/VM.java
@@ -37,7 +37,7 @@ public class VM extends Host {
 	 * @param host Host node
 	 * @param name name of the machine
 	 * @param ramSize size of the RAM that should be allocated (in MBytes)
-	 * @param migNetSpeed (network bandwith allocated for migrations in MB/s, if you don't know put zero ;))
+	 * @param migNetSpeed (network bandwidth allocated for migrations in MB/s, if you don't know put zero ;))
 	 * @param dpIntensity (dirty page percentage according to migNetSpeed, [0-100], if you don't know put zero ;))
 	 */	
 	public VM(Host host, String name, int ramSize, int migNetSpeed, int dpIntensity){
@@ -50,7 +50,7 @@ public class VM extends Host {
 	 * @param name name of the machine
 	 * @param coreAmount the amount of cores of the VM
 	 * @param ramSize size of the RAM that should be allocated (in MBytes)
-	 * @param migNetSpeed (network bandwith allocated for migrations in MB/s, if you don't know put zero ;))
+	 * @param migNetSpeed (network bandwidth allocated for migrations in MB/s, if you don't know put zero ;))
 	 * @param dpIntensity (dirty page percentage according to migNetSpeed, [0-100], if you don't know put zero ;))
 	 */
 	public VM(Host host, String name, int coreAmount, int ramSize, int migNetSpeed, int dpIntensity){
@@ -97,7 +97,7 @@ public class VM extends Host {
 	/**
 	 * Natively implemented method create the VM.
 	 * @param ramSize size of the RAM that should be allocated (in MB)
-	 * @param migNetSpeed (network bandwith allocated for migrations in MB/s, if you don't know put zero ;))
+	 * @param migNetSpeed (network bandwidth allocated for migrations in MB/s, if you don't know put zero ;))
 	 * @param dpIntensity (dirty page intensity, a percentage of migNetSpeed [0-100],  if you don't know put zero ;))
 	 */
 	private native void create(Host host, String name, int coreAmount, int ramSize, int migNetSpeed, int dpIntensity);
diff --git a/src/include/xbt/mmalloc.h b/src/include/xbt/mmalloc.h
index 792e9e9eaf..f71e3b428e 100644
--- a/src/include/xbt/mmalloc.h
+++ b/src/include/xbt/mmalloc.h
@@ -23,7 +23,7 @@ SG_BEGIN_DECL()
  * process. It thus works by redefining all the classical memory management functions (malloc and friends) with an
  * extra first argument: the heap in which the memory is to be taken.
  *
- * The heap structure itself is an opaque object that shouldnt be messed with.
+ * The heap structure itself is an opaque object that shouldn't be messed with.
  */
 typedef struct mdesc s_xbt_mheap_t;
 typedef s_xbt_mheap_t* xbt_mheap_t;
diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index ff20f26bfa..0080458b2f 100644
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -268,11 +268,11 @@ std::string TRACE_get_filename()
 
 void TRACE_global_init()
 {
-  static bool is_initialised = false;
-  if (is_initialised)
+  static bool is_initialized = false;
+  if (is_initialized)
     return;
 
-  is_initialised = true;
+  is_initialized = true;
 
   /* name of the tracefile */
   simgrid::config::declare_flag<std::string>("tracing/filename", "Trace file created by the instrumented SimGrid.",
diff --git a/src/instr/instr_interface.cpp b/src/instr/instr_interface.cpp
index 83a1112a35..ba355e2458 100644
--- a/src/instr/instr_interface.cpp
+++ b/src/instr/instr_interface.cpp
@@ -138,7 +138,7 @@ xbt_dynar_t TRACE_get_categories ()
  */
 void TRACE_declare_mark(const char *mark_type)
 {
-  /* safe switchs. tracing has to be activated and if platform is not traced, we can't deal with marks */
+  /* safe switches. tracing has to be activated and if platform is not traced, we can't deal with marks */
   if (not TRACE_is_enabled() || not TRACE_needs_platform())
     return;
 
diff --git a/src/instr/instr_private.hpp b/src/instr/instr_private.hpp
index 35e9893ac2..5d1b98c302 100644
--- a/src/instr/instr_private.hpp
+++ b/src/instr/instr_private.hpp
@@ -56,7 +56,7 @@ public:
   explicit TIData(const std::string& name) : name_(name){};
   // CPuTI: compute, sleep (+ waitAny and waitall out of laziness)
   explicit TIData(const std::string& name, double amount) : name_(name), amount_(amount){};
-  // Pt2PtTI: send, isend, sssend, issend, recv, irecv
+  // Pt2PtTI: send, isend, ssend, issend, recv, irecv
   explicit TIData(const std::string& name, int endpoint, int size, const std::string& datatype)
       : name_(name), endpoint(endpoint), send_size(size), send_type(datatype){};
   // CollTI: bcast, reduce, allreduce, gather, scatter, allgather, alltoall
diff --git a/src/internal_config.h.in b/src/internal_config.h.in
index f6e6193193..1f40d745af 100644
--- a/src/internal_config.h.in
+++ b/src/internal_config.h.in
@@ -99,5 +99,5 @@
 /* The lib unwind library (for MC and backtrace display) */
 #cmakedefine01 HAVE_LIBUNWIND
 /* The boost_stacktrace_backtrace library */
-#cmakedefine01 HAVE_BOOST_STACKTRACE_BACKTRACE /* prefered */
+#cmakedefine01 HAVE_BOOST_STACKTRACE_BACKTRACE /* preferred */
 #cmakedefine01 HAVE_BOOST_STACKTRACE_ADDR2LINE /* fallback */
diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp
index 03c3cbfb25..9a3a339af3 100644
--- a/src/kernel/activity/CommImpl.cpp
+++ b/src/kernel/activity/CommImpl.cpp
@@ -284,7 +284,7 @@ static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall)
   size_t count                                = simcall_comm_waitany__get__count(simcall);
 
   for (size_t i = 0; i < count; i++) {
-    // Remove the first occurence of simcall:
+    // Remove the first occurrence of simcall:
     auto* comm = comms[i];
     auto j     = boost::range::find(comm->simcalls_, simcall);
     if (j != comm->simcalls_.end())
diff --git a/src/kernel/activity/CommImpl.hpp b/src/kernel/activity/CommImpl.hpp
index 9321fafed7..0d2e742428 100644
--- a/src/kernel/activity/CommImpl.hpp
+++ b/src/kernel/activity/CommImpl.hpp
@@ -69,7 +69,7 @@ expectations of the other side, too. See  */
   actor::ActorImplPtr src_actor_ = nullptr;
   actor::ActorImplPtr dst_actor_ = nullptr;
 
-  /* Data to be transfered */
+  /* Data to be transferred */
   unsigned char* src_buff_ = nullptr;
   unsigned char* dst_buff_ = nullptr;
   size_t src_buff_size_    = 0;
diff --git a/src/kernel/activity/ExecImpl.cpp b/src/kernel/activity/ExecImpl.cpp
index a210ab0ef1..7c899d4b0a 100644
--- a/src/kernel/activity/ExecImpl.cpp
+++ b/src/kernel/activity/ExecImpl.cpp
@@ -56,7 +56,7 @@ void simcall_HANDLER_execution_waitany_for(smx_simcall_t simcall, simgrid::kerne
   } else {
     simcall->timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall, execs, count]() {
       for (size_t i = 0; i < count; i++) {
-        // Remove the first occurence of simcall:
+        // Remove the first occurrence of simcall:
         auto* exec = execs[i];
         auto j     = boost::range::find(exec->simcalls_, simcall);
         if (j != exec->simcalls_.end())
@@ -222,7 +222,7 @@ void ExecImpl::finish()
       size_t count                                = simcall_execution_waitany_for__get__count(simcall);
 
       for (size_t i = 0; i < count; i++) {
-        // Remove the first occurence of simcall:
+        // Remove the first occurrence of simcall:
         auto* exec = execs[i];
         auto j     = boost::range::find(exec->simcalls_, simcall);
         if (j != exec->simcalls_.end())
diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp
index b2fadf009a..b5e5e64f38 100644
--- a/src/kernel/context/Context.hpp
+++ b/src/kernel/context/Context.hpp
@@ -64,7 +64,7 @@ public:
   virtual void suspend() = 0;
 
   // Retrieving the self() context
-  /** @brief Retrives the current context of this thread */
+  /** @brief Retrieves the current context of this thread */
   static Context* self();
   /** @brief Sets the current context of this thread */
   static void set_current(Context* self);
diff --git a/src/kernel/context/ContextUnix.cpp b/src/kernel/context/ContextUnix.cpp
index 569f2d893c..fba49bf5e5 100644
--- a/src/kernel/context/ContextUnix.cpp
+++ b/src/kernel/context/ContextUnix.cpp
@@ -74,7 +74,7 @@ UContext::UContext(std::function<void()>&& code, actor::ActorImpl* actor, Swappe
     this->uc_.uc_stack.ss_sp   = sg_makecontext_stack_addr(get_stack());
     this->uc_.uc_stack.ss_size = sg_makecontext_stack_size(smx_context_stack_size);
     // Makecontext expects integer arguments; we want to pass a pointer.
-    // This context address is decomposed into a serie of integers, which are passed as arguments to makecontext.
+    // This context address is decomposed into a series of integers, which are passed as arguments to makecontext.
 
     int ctx_addr[CTX_ADDR_LEN]{};
     UContext* arg = this;
diff --git a/src/kernel/lmm/maxmin.cpp b/src/kernel/lmm/maxmin.cpp
index 1cc6c4ed6f..10499a0de4 100644
--- a/src/kernel/lmm/maxmin.cpp
+++ b/src/kernel/lmm/maxmin.cpp
@@ -31,7 +31,7 @@ int Element::get_concurrency() const
 {
   // Ignore element with weight less than one (e.g. cross-traffic)
   return (consumption_weight >= 1) ? 1 : 0;
-  // There are other alternatives, but they will change the behaviour of the model..
+  // There are other alternatives, but they will change the behavior of the model..
   // So do not use it unless you want to make a new model.
   // If you do, remember to change the variables concurrency share to reflect it.
   // Potential examples are:
@@ -236,7 +236,7 @@ void System::expand(Constraint* cnst, Variable* var, double consumption_weight)
   modified_ = true;
 
   // Check if this variable already has an active element in this constraint
-  // If it does, substract it from the required slack
+  // If it does, subtract it from the required slack
   int current_share = 0;
   if (var->concurrency_share_ > 1) {
     for (Element& elem : var->cnsts_) {
@@ -597,7 +597,7 @@ template <class CnstList> void System::lmm_solve(CnstList& cnst_list)
       XBT_DEBUG("Min usage: %f, Var(%d).penalty: %f, Var(%d).value: %f ", min_usage, var.rank_, var.sharing_penalty_,
                 var.rank_, var.value_);
 
-      /* Update the usage of contraints where this variable is involved */
+      /* Update the usage of constraints where this variable is involved */
       for (Element& elem : var.cnsts_) {
         Constraint* cnst = elem.constraint;
         if (cnst->sharing_policy_ != s4u::Link::SharingPolicy::FATPIPE) {
@@ -927,7 +927,7 @@ void System::remove_all_modified_set()
   // In effect, the var->visited value will no more be equal to visited counter
   // To be clean, when visited counter has wrapped around, we force these var->visited values so that variables that
   // were in the modified a long long time ago are not wrongly skipped here, which would lead to very nasty bugs
-  // (i.e. not readibily reproducible, and requiring a lot of run time before happening).
+  // (i.e. not readily reproducible, and requiring a lot of run time before happening).
   if (++visited_counter_ == 1) {
     /* the counter wrapped around, reset each variable->visited */
     for (Variable& var : variable_set)
diff --git a/src/kernel/lmm/maxmin.hpp b/src/kernel/lmm/maxmin.hpp
index 4e88bba2b8..cc4ed51dbb 100644
--- a/src/kernel/lmm/maxmin.hpp
+++ b/src/kernel/lmm/maxmin.hpp
@@ -174,7 +174,7 @@ public:
  *     the corresponding action will enable it (at least this is the idea).
  * \li Enabled elements which variable's weight is non-zero. They are utilized in some LMM functions.
  * \li Active elements which variable's weight is non-zero (i.e. it is enabled) AND its element value is non-zero.
- *     LMM_solve iterates over active elements during resolution, dynamically making them active or unactive.
+ *     LMM_solve iterates over active elements during resolution, dynamically making them active or inactive.
  */
 class XBT_PUBLIC Constraint {
 public:
@@ -275,7 +275,7 @@ public:
   ConstraintLight* cnst_light_;
 
 private:
-  static int next_rank_;  // To give a separate rank_ to each contraint
+  static int next_rank_;  // To give a separate rank_ to each constraint
   int concurrency_limit_; /* The maximum number of variables that may be enabled at any time (stage variables if
                            * necessary) */
   resource::Resource* id_;
diff --git a/src/kernel/lmm/maxmin_test.cpp b/src/kernel/lmm/maxmin_test.cpp
index 8075d9e046..79fc3c06cf 100644
--- a/src/kernel/lmm/maxmin_test.cpp
+++ b/src/kernel/lmm/maxmin_test.cpp
@@ -246,7 +246,7 @@ TEST_CASE("kernel::lmm Single constraint unshared systems", "[kernel-lmm-unshare
 
     /*
      * Multiple constraint systems can be solved with shared variables
-     * on unshair constraints.
+     * on unshared constraints.
      *
      * In details:
      *   o System:  a1 * p1 * \rho1  +  a2 * p2 * \rho2 < C1
diff --git a/src/kernel/resource/profile/DatedValue.hpp b/src/kernel/resource/profile/DatedValue.hpp
index 84bdf99bae..23f10f0835 100644
--- a/src/kernel/resource/profile/DatedValue.hpp
+++ b/src/kernel/resource/profile/DatedValue.hpp
@@ -21,7 +21,7 @@ namespace profile {
  * - #simgrid::kernel::profile::Event: links a given trace to a given SimGrid resource.
  *   A Cpu for example has 2 kinds of events: state (ie, is it ON/OFF) and speed,
  *   while a link has 3 iterators: state, bandwidth and latency.
- * - #simgrid::kernel::profile::FutureEvtSet: makes it easy to find the next occuring event of all profiles
+ * - #simgrid::kernel::profile::FutureEvtSet: makes it easy to find the next occurring event of all profiles
  */
 class XBT_PUBLIC DatedValue {
 public:
diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp
index fd2a827452..96345afb7a 100644
--- a/src/kernel/routing/ClusterZone.cpp
+++ b/src/kernel/routing/ClusterZone.cpp
@@ -12,7 +12,7 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf");
 
 /* This routing is specifically setup to represent clusters, aka homogeneous sets of machines
- * Note that a router is created, easing the interconnexion with the rest of the world. */
+ * Note that a router is created, easing the interconnection with the rest of the world. */
 
 namespace simgrid {
 namespace kernel {
diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp
index a1001e6921..11e544c49a 100644
--- a/src/kernel/routing/TorusZone.cpp
+++ b/src/kernel/routing/TorusZone.cpp
@@ -104,7 +104,7 @@ void TorusZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs*
    */
 
   /*
-   * Arrays that hold the coordinates of the current node andthe target; comparing the values at the i-th position of
+   * Arrays that hold the coordinates of the current node and the target; comparing the values at the i-th position of
    * both arrays, we can easily assess whether we need to route into this dimension or not.
    */
   const unsigned int dsize = dimensions_.size();
diff --git a/src/mc/checker/SimcallInspector.hpp b/src/mc/checker/SimcallInspector.hpp
index 525f3a5ce0..f193ef1e3b 100644
--- a/src/mc/checker/SimcallInspector.hpp
+++ b/src/mc/checker/SimcallInspector.hpp
@@ -28,7 +28,7 @@ public:
    */
   virtual void arm() {}
 
-  /** Some simcalls may only be observable under some circomstances.
+  /** Some simcalls may only be observable under some circumstances.
    * Most simcalls are not visible from the MC because they don't have an inspector at all. */
   virtual bool is_visible() { return true; }
   virtual std::string to_string() = 0;
diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index f302e81f87..862bace19b 100644
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -3,7 +3,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-/** \file compare.cpp Memory snapshooting and comparison                    */
+/** \file compare.cpp Memory snapshotting and comparison                    */
 
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_private.hpp"
@@ -533,7 +533,7 @@ static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, cons
                                        const simgrid::mc::Snapshot& snapshot2, HeapLocationPairs* previous,
                                        simgrid::mc::Type* type, int area_size, int check_ignore, int pointer_level)
 {
-  // HACK: This should not happen but in pratice, there are some
+  // HACK: This should not happen but in practice, there are some
   // DW_TAG_typedef without an associated DW_AT_type:
   //<1><538832>: Abbrev Number: 111 (DW_TAG_typedef)
   //    <538833>   DW_AT_name        : (indirect string, offset: 0x2292f3): gregset_t
@@ -705,7 +705,7 @@ static simgrid::mc::Type* get_offset_type(void* real_base_address, simgrid::mc::
                                           const simgrid::mc::Snapshot& snapshot)
 {
 
-  // Beginning of the block, the infered variable type if the type of the block:
+  // Beginning of the block, the inferred variable type if the type of the block:
   if (offset == 0)
     return type;
 
diff --git a/src/mc/inspect/ObjectInformation.cpp b/src/mc/inspect/ObjectInformation.cpp
index 64adf52a8c..ed52d5a055 100644
--- a/src/mc/inspect/ObjectInformation.cpp
+++ b/src/mc/inspect/ObjectInformation.cpp
@@ -20,7 +20,7 @@ namespace mc {
  * (there is no offset) i.e.
  * \f$\text{virtual address} = \{dwarf address}\f$
  *
- * For a shared object, the addresses are offset from the begining
+ * For a shared object, the addresses are offset from the beginning
  * of the shared object (the base address of the mapped shared
  * object must be used as offset
  * i.e. \f$\text{virtual address} = \text{shared object base address}
diff --git a/src/mc/inspect/ObjectInformation.hpp b/src/mc/inspect/ObjectInformation.hpp
index 71550bea68..0e3a3941f0 100644
--- a/src/mc/inspect/ObjectInformation.hpp
+++ b/src/mc/inspect/ObjectInformation.hpp
@@ -107,7 +107,7 @@ public:
    *
    *  More precisely we check if this is an ET_EXE ELF. These ELF files
    *  use fixed addresses instead of base-address relative addresses.
-   *  Position independant executables are in fact ET_DYN.
+   *  Position independent executables are in fact ET_DYN.
    */
   bool executable() const { return this->flags & simgrid::mc::ObjectInformation::Executable; }
 
diff --git a/src/mc/inspect/mc_unw_vmread.cpp b/src/mc/inspect/mc_unw_vmread.cpp
index 5f2acba289..d75ec4db6a 100644
--- a/src/mc/inspect/mc_unw_vmread.cpp
+++ b/src/mc/inspect/mc_unw_vmread.cpp
@@ -100,7 +100,7 @@ namespace unw {
  *  does not use ptrace() to read the target process memory by
  *  `process_vm_readv()` or `/dev/${pid}/mem` if possible.
  *
- *  Does not support any MC-specific behaviour (privatization, snapshots)
+ *  Does not support any MC-specific behavior (privatization, snapshots)
  *  and `ucontext_t`.
  *
  *  It works with `void*` contexts allocated with `_UPT_create(pid)`.
diff --git a/src/mc/mc_base.h b/src/mc/mc_base.h
index f66f1828ef..a1160d0c6e 100644
--- a/src/mc/mc_base.h
+++ b/src/mc/mc_base.h
@@ -35,7 +35,7 @@ XBT_PRIVATE void handle_simcall(smx_simcall_t req, int req_num);
  *  Most requests are always enabled but WAIT and WAITANY
  *  are not always enabled: a WAIT where the communication does not
  *  have both a source and a destination yet is not enabled
- *  (unless timeout is enabled in the wait and enabeld in SimGridMC).
+ *  (unless timeout is enabled in the wait and enabled in SimGridMC).
  */
 XBT_PRIVATE bool actor_is_enabled(smx_actor_t process);
 
diff --git a/src/mc/remote/RemoteClient.cpp b/src/mc/remote/RemoteClient.cpp
index 1828f2340a..3f65ed56be 100644
--- a/src/mc/remote/RemoteClient.cpp
+++ b/src/mc/remote/RemoteClient.cpp
@@ -246,7 +246,7 @@ void RemoteClient::refresh_heap()
 
 /** Refresh the information about the process
  *
- *  Do not use direclty, this is used by the getters when appropriate
+ *  Do not use directly, this is used by the getters when appropriate
  *  in order to have fresh data.
  * */
 void RemoteClient::refresh_malloc_info()
@@ -368,7 +368,7 @@ const simgrid::mc::Variable* RemoteClient::find_variable(const char* name) const
 {
   // First lookup the variable in the executable shared object.
   // A global variable used directly by the executable code from a library
-  // is reinstanciated in the executable memory .data/.bss.
+  // is reinstantiated in the executable memory .data/.bss.
   // We need to look up the variable in the executable first.
   if (this->binary_info) {
     std::shared_ptr<simgrid::mc::ObjectInformation> const& info = this->binary_info;
diff --git a/src/mc/sosp/PageStore.cpp b/src/mc/sosp/PageStore.cpp
index ce53075221..e99c188997 100644
--- a/src/mc/sosp/PageStore.cpp
+++ b/src/mc/sosp/PageStore.cpp
@@ -92,7 +92,7 @@ void PageStore::resize(std::size_t size)
     // Check if expanding worked
     if (new_memory != (char*)this->memory_ + old_bytesize) {
       // New memory segment could not be put at the end of this->memory_,
-      // so cancel this one and try to rellocate everything and copy data
+      // so cancel this one and try to relocate everything and copy data
       munmap(new_memory, new_bytesize - old_bytesize);
       new_memory =
           mmap(nullptr, new_bytesize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_POPULATE, -1, 0);
diff --git a/src/mc/sosp/Region.hpp b/src/mc/sosp/Region.hpp
index 8293df6b5c..4985c61c1d 100644
--- a/src/mc/sosp/Region.hpp
+++ b/src/mc/sosp/Region.hpp
@@ -62,7 +62,7 @@ public:
   /** @brief Restore a region from a snapshot */
   void restore();
 
-  /** @brief Read memory that was snapshoted in this region
+  /** @brief Read memory that was snapshotted in this region
    *
    *  @param target  Buffer to store contiguously the value if it spans over several pages
    *  @param addr    Process (non-snapshot) address of the data
diff --git a/src/mc/sosp/Snapshot.cpp b/src/mc/sosp/Snapshot.cpp
index bc32ba67a4..2f50339173 100644
--- a/src/mc/sosp/Snapshot.cpp
+++ b/src/mc/sosp/Snapshot.cpp
@@ -249,7 +249,7 @@ void* Snapshot::read_bytes(void* buffer, std::size_t size, RemotePtr<void> addre
   } else
     return this->process()->read_bytes(buffer, size, address, options);
 }
-/** @brief Find the snapshoted region from a pointer
+/** @brief Find the snapshotted region from a pointer
  *
  *  @param addr     Pointer
  * */
@@ -267,7 +267,7 @@ Region* Snapshot::get_region(const void* addr) const
   return nullptr;
 }
 
-/** @brief Find the snapshoted region from a pointer, with a hinted_region */
+/** @brief Find the snapshotted region from a pointer, with a hinted_region */
 Region* Snapshot::get_region(const void* addr, Region* hinted_region) const
 {
   if (hinted_region->contain(simgrid::mc::remote(addr)))
@@ -282,7 +282,7 @@ void Snapshot::restore(RemoteClient* process)
 
   // Restore regions
   for (std::unique_ptr<simgrid::mc::Region> const& region : snapshot_regions_) {
-    if (region) // privatized variables are not snapshoted
+    if (region) // privatized variables are not snapshotted
       region.get()->restore();
   }
 
diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp
index 80a229a7f4..9a62572283 100644
--- a/src/msg/msg_task.cpp
+++ b/src/msg/msg_task.cpp
@@ -203,7 +203,7 @@ void Task::report_multiple_use() const
  * @param flop_amount a value of the processing amount (in flop) needed to process this new task.
  * If 0, then it cannot be executed with MSG_task_execute(). This value has to be >=0.
  * @param message_size a value of the amount of data (in bytes) needed to transfer this new task. If 0, then it cannot
- * be transfered with MSG_task_send() and MSG_task_recv(). This value has to be >=0.
+ * be transferred with MSG_task_send() and MSG_task_recv(). This value has to be >=0.
  * @param data a pointer to any data may want to attach to the new object.  It is for user-level information and can
  * be nullptr. It can be retrieved with the function @ref MSG_task_get_data.
  * @return The new corresponding object.
@@ -668,7 +668,7 @@ msg_error_t MSG_task_destroy(msg_task_t task)
 
 /** @brief Cancel the given task
  *
- * If it was currently executed or transfered, the working process is stopped.
+ * If it was currently executed or transferred, the working process is stopped.
  */
 msg_error_t MSG_task_cancel(msg_task_t task)
 {
diff --git a/src/plugins/file_system/s4u_FileSystem.cpp b/src/plugins/file_system/s4u_FileSystem.cpp
index 67e7ffd222..9585a66bce 100644
--- a/src/plugins/file_system/s4u_FileSystem.cpp
+++ b/src/plugins/file_system/s4u_FileSystem.cpp
@@ -205,7 +205,7 @@ sg_size_t File::write(sg_size_t size, int write_inside)
     if (sg_storage_get_size_used(local_storage_) >= sg_storage_get_size(local_storage_))
       return 0;
     if (write_inside == 0) {
-      /* Substract the part of the file that might disappear from the used sized on the storage element */
+      /* Subtract the part of the file that might disappear from the used sized on the storage element */
       local_storage_->extension<FileSystemStorageExt>()->decr_used_size(size_ - current_position_);
       write_size = local_storage_->write(size);
       local_storage_->extension<FileSystemStorageExt>()->incr_used_size(write_size);
@@ -230,7 +230,7 @@ sg_size_t File::write(sg_size_t size, int write_inside)
     if (sg_disk_get_size_used(local_disk_) >= sg_disk_get_size(local_disk_))
       return 0;
     if (write_inside == 0) {
-      /* Substract the part of the file that might disappear from the used sized on the storage element */
+      /* Subtract the part of the file that might disappear from the used sized on the storage element */
       local_disk_->extension<FileSystemDiskExt>()->decr_used_size(size_ - current_position_);
       write_size = local_disk_->write(size);
       local_disk_->extension<FileSystemDiskExt>()->incr_used_size(write_size);
diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp
index 86eecf1527..2466f28eb0 100644
--- a/src/plugins/host_dvfs.cpp
+++ b/src/plugins/host_dvfs.cpp
@@ -221,9 +221,9 @@ public:
  *
  * > The CPUfreq governor "conservative", much like the "ondemand"
  * > governor, sets the CPU frequency depending on the current usage.  It
- * > differs in behaviour in that it gracefully increases and decreases the
+ * > differs in behavior in that it gracefully increases and decreases the
  * > CPU speed rather than jumping to max speed the moment there is any load
- * > on the CPU. This behaviour is more suitable in a battery powered
+ * > on the CPU. This behavior is more suitable in a battery powered
  * > environment.
  */
 class Conservative : public Governor {
diff --git a/src/plugins/host_energy.cpp b/src/plugins/host_energy.cpp
index 85a17d3f3d..5cbb75c2c0 100644
--- a/src/plugins/host_energy.cpp
+++ b/src/plugins/host_energy.cpp
@@ -370,7 +370,7 @@ void HostEnergy::init_watts_range_list()
         } else {
           p_epsilon = p_one_core - ((p_full - p_one_core) / (host_->get_core_count() - 1));
         }
-      } else { // consuption given with idle and full only
+      } else { // consumption given with idle and full only
         p_full = xbt_str_parse_double((current_power_values.at(1)).c_str(),
                                       "Invalid obsolete XML file. Fix your watt_per_state property.");
         if (host_->get_core_count() == 1) {
diff --git a/src/plugins/vm/VmLiveMigration.hpp b/src/plugins/vm/VmLiveMigration.hpp
index fd84132184..a9810130f3 100644
--- a/src/plugins/vm/VmLiveMigration.hpp
+++ b/src/plugins/vm/VmLiveMigration.hpp
@@ -27,7 +27,8 @@ public:
 };
 
 class MigrationRx {
-  /* The miration_rx process uses mbox_ctl to let the caller of do_migration()  know the completion of the migration. */
+  /* The migration_rx process uses mbox_ctl to let the caller of do_migration()  know the completion of the migration.
+   */
   s4u::Mailbox* mbox_ctl;
   /* The migration_rx and migration_tx processes use mbox to transfer migration data. */
   s4u::Mailbox* mbox;
diff --git a/src/s4u/s4u_Host.cpp b/src/s4u/s4u_Host.cpp
index 1d89a9e811..a891bc6d35 100644
--- a/src/s4u/s4u_Host.cpp
+++ b/src/s4u/s4u_Host.cpp
@@ -600,7 +600,7 @@ double sg_host_route_latency(sg_host_t from, sg_host_t to)
   return res;
 }
 /**
- * @brief Find the bandwitdh of the route between two hosts
+ * @brief Find the bandwidth of the route between two hosts
  *
  * @param from where from
  * @param to where to
diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp
index 9f999f7e5e..90d8662e18 100644
--- a/src/simdag/sd_dotloader.cpp
+++ b/src/simdag/sd_dotloader.cpp
@@ -31,7 +31,7 @@ static void dot_task_p_free(void *task) {
  * The size attribute of a node describes:
  *   - for a compute task: the amount of flops to execute
  *   - for a communication task : the amount of bytes to transfer
- * If this attribute is ommited, the default value is zero.
+ * If this attribute is omitted, the default value is zero.
  */
 xbt_dynar_t SD_dotload(const char *filename) {
   return SD_dotload_generic(filename, true, false);
diff --git a/src/simgrid/version.h.in b/src/simgrid/version.h.in
index fa8433b966..1f3389cb7f 100644
--- a/src/simgrid/version.h.in
+++ b/src/simgrid/version.h.in
@@ -1,4 +1,4 @@
-/* src/simgrid/version.h - internal versionning info                        */
+/* src/simgrid/version.h - internal versioning info                        */
 
 /* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved.          */
 
diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp
index c84c5b77b7..a00699793c 100644
--- a/src/simix/smx_global.cpp
+++ b/src/simix/smx_global.cpp
@@ -231,7 +231,7 @@ void SIMIX_global_init(int *argc, char **argv)
     SIMIX_context_mod_init();
 
     // Either create a new context with maestro or create
-    // a context object with the current context mestro):
+    // a context object with the current context maestro):
     simgrid::kernel::actor::create_maestro(maestro_code);
 
     /* Prepare to display some more info when dying on Ctrl-C pressing */
diff --git a/src/smpi/bindings/smpi_pmpi_coll.cpp b/src/smpi/bindings/smpi_pmpi_coll.cpp
index 7f6f627fe7..bf4952b2b9 100644
--- a/src/smpi/bindings/smpi_pmpi_coll.cpp
+++ b/src/smpi/bindings/smpi_pmpi_coll.cpp
@@ -742,7 +742,7 @@ int PMPI_Ialltoall(const void* sendbuf, int sendcount, MPI_Datatype sendtype, vo
   std::unique_ptr<unsigned char[]> tmp_sendbuf;
   if (sendbuf == MPI_IN_PLACE) {
     tmp_sendbuf.reset(new unsigned char[recvcount * comm->size() * recvtype->size()]);
-    // memcpy(??,nullptr,0) is actually undefined behavor, even if harmless.
+    // memcpy(??,nullptr,0) is actually undefined behavior, even if harmless.
     if (recvbuf != nullptr)
       memcpy(tmp_sendbuf.get(), recvbuf, recvcount * comm->size() * recvtype->size());
     real_sendbuf = tmp_sendbuf.get();
diff --git a/src/smpi/bindings/smpi_pmpi_request.cpp b/src/smpi/bindings/smpi_pmpi_request.cpp
index af333ecdb2..7d1f2b0ef6 100644
--- a/src/smpi/bindings/smpi_pmpi_request.cpp
+++ b/src/smpi/bindings/smpi_pmpi_request.cpp
@@ -796,7 +796,7 @@ int PMPI_Wait(MPI_Request * request, MPI_Status * status)
   } else if (*request == MPI_REQUEST_NULL) {
     retval = MPI_SUCCESS;
   } else {
-    //for tracing, save the handle which might get overriden before we can use the helper on it
+    // for tracing, save the handle which might get overridden before we can use the helper on it
     MPI_Request savedreq = *request;
     if (savedreq != MPI_REQUEST_NULL && not(savedreq->flags() & MPI_REQ_FINISHED)
     && not(savedreq->flags() & MPI_REQ_GENERALIZED))
@@ -832,7 +832,7 @@ int PMPI_Waitany(int count, MPI_Request requests[], int *index, MPI_Status * sta
     return MPI_SUCCESS;
 
   smpi_bench_end();
-  //for tracing, save the handles which might get overriden before we can use the helper on it
+  // for tracing, save the handles which might get overridden before we can use the helper on it
   std::vector<MPI_Request> savedreqs(requests, requests + count);
   for (MPI_Request& req : savedreqs) {
     if (req != MPI_REQUEST_NULL && not(req->flags() & MPI_REQ_FINISHED))
@@ -863,7 +863,7 @@ int PMPI_Waitall(int count, MPI_Request requests[], MPI_Status status[])
 {
   smpi_bench_end();
 
-  //for tracing, save the handles which might get overriden before we can use the helper on it
+  // for tracing, save the handles which might get overridden before we can use the helper on it
   std::vector<MPI_Request> savedreqs(requests, requests + count);
   for (MPI_Request& req : savedreqs) {
     if (req != MPI_REQUEST_NULL && not(req->flags() & MPI_REQ_FINISHED))
diff --git a/src/smpi/colls/allgather/allgather-2dmesh.cpp b/src/smpi/colls/allgather/allgather-2dmesh.cpp
index b6b06fcb6e..0bf9bbcda7 100644
--- a/src/smpi/colls/allgather/allgather-2dmesh.cpp
+++ b/src/smpi/colls/allgather/allgather-2dmesh.cpp
@@ -62,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  * Descp: takes a number and tries to find a factoring of x, y mesh out of it
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
  ****************************************************************************/
 #ifndef TWOD
 #define TWOD
@@ -103,7 +103,7 @@ static int is_2dmesh(int num, int *i, int *j)
  * algorithm. Allgather ommunication occurs first in the x dimension then in
  * the y dimension.  The communication in each dimension follows
  * "simple"
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 ****************************************************************************/
 
 namespace simgrid{
diff --git a/src/smpi/colls/allgather/allgather-3dmesh.cpp b/src/smpi/colls/allgather/allgather-3dmesh.cpp
index b189670d0d..fa370fe43b 100644
--- a/src/smpi/colls/allgather/allgather-3dmesh.cpp
+++ b/src/smpi/colls/allgather/allgather-3dmesh.cpp
@@ -90,7 +90,7 @@ static int is_3dmesh(int num, int *i, int *j, int *k)
  * algorithm. Allgather ommunication occurs first in the x dimension, y
  * dimension, and then in the z dimension. Communication in each dimension
  * follows "simple"
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 ****************************************************************************/
 namespace simgrid{
 namespace smpi{
diff --git a/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp b/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp
index f05db0c18a..7ffaed9739 100644
--- a/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp
+++ b/src/smpi/colls/allgather/allgather-NTSLR-NB.cpp
@@ -9,8 +9,7 @@
 namespace simgrid{
 namespace smpi{
 
-
-// Allgather-Non-Topoloty-Scecific-Logical-Ring algorithm
+// Allgather-Non-Topology-Specific-Logical-Ring algorithm
 int
 Coll_allgather_NTSLR_NB::allgather(const void *sbuf, int scount, MPI_Datatype stype,
                                    void *rbuf, int rcount, MPI_Datatype rtype,
diff --git a/src/smpi/colls/allgather/allgather-NTSLR.cpp b/src/smpi/colls/allgather/allgather-NTSLR.cpp
index 3aa5365b46..8c65ed8528 100644
--- a/src/smpi/colls/allgather/allgather-NTSLR.cpp
+++ b/src/smpi/colls/allgather/allgather-NTSLR.cpp
@@ -9,9 +9,7 @@
 namespace simgrid{
 namespace smpi{
 
-
-
-// Allgather-Non-Topoloty-Scecific-Logical-Ring algorithm
+// Allgather-Non-Topology-Specific-Logical-Ring algorithm
 int
 Coll_allgather_NTSLR::allgather(const void *sbuf, int scount, MPI_Datatype stype,
                                 void *rbuf, int rcount, MPI_Datatype rtype,
diff --git a/src/smpi/colls/allgather/allgather-bruck.cpp b/src/smpi/colls/allgather/allgather-bruck.cpp
index 0aa067c6b6..b2c49f7e1b 100644
--- a/src/smpi/colls/allgather/allgather-bruck.cpp
+++ b/src/smpi/colls/allgather/allgather-bruck.cpp
@@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 *****************************************************************************/
 
-
 /*****************************************************************************
  * Function: allgather_bruck
  * return: int
@@ -63,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *   comm: communication
  * Descrp: Function realizes the allgather operation using the bruck
  *         algorithm.
- * Auther: MPICH
+ * Author: MPICH
  * Comment: Original bruck algorithm from MPICH is slightly modified by
  *          Ahmad Faraj.
  ****************************************************************************/
diff --git a/src/smpi/colls/allgather/allgather-pair.cpp b/src/smpi/colls/allgather/allgather-pair.cpp
index 5794d95fd8..5505bd5467 100644
--- a/src/smpi/colls/allgather/allgather-pair.cpp
+++ b/src/smpi/colls/allgather/allgather-pair.cpp
@@ -62,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *   comm: communication
  * Descrp: Function works when P is power of two. In each phase of P - 1
  *         phases, nodes in pair communicate their data.
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
  ****************************************************************************/
 
 namespace simgrid{
diff --git a/src/smpi/colls/allgather/allgather-ring.cpp b/src/smpi/colls/allgather/allgather-ring.cpp
index 26e369d24c..fa619db763 100644
--- a/src/smpi/colls/allgather/allgather-ring.cpp
+++ b/src/smpi/colls/allgather/allgather-ring.cpp
@@ -61,7 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *   recv_type: data type of elements being received
  *   comm: communication
  * Descrp: Function works in P - 1 steps. In step i, node j - i -> j -> j+ i.
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
  ****************************************************************************/
 
 namespace simgrid{
diff --git a/src/smpi/colls/allgather/allgather-spreading-simple.cpp b/src/smpi/colls/allgather/allgather-spreading-simple.cpp
index a1f55ca2f6..0536c32eda 100644
--- a/src/smpi/colls/allgather/allgather-spreading-simple.cpp
+++ b/src/smpi/colls/allgather/allgather-spreading-simple.cpp
@@ -64,7 +64,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *         order of communications for node i is i -> i + 1, i -> i + 2, ...,
  *         i -> (i + p -1) % P.
  *
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
  ****************************************************************************/
 
 namespace simgrid{
diff --git a/src/smpi/colls/allgatherv/allgatherv-pair.cpp b/src/smpi/colls/allgatherv/allgatherv-pair.cpp
index 1e490a8d58..f72197058e 100644
--- a/src/smpi/colls/allgatherv/allgatherv-pair.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-pair.cpp
@@ -62,7 +62,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *   comm: communication
  * Descrp: Function works when P is power of two. In each phase of P - 1
  *         phases, nodes in pair communicate their data.
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
  ****************************************************************************/
 
 namespace simgrid{
diff --git a/src/smpi/colls/allgatherv/allgatherv-ring.cpp b/src/smpi/colls/allgatherv/allgatherv-ring.cpp
index b09243566c..d6a9bec541 100644
--- a/src/smpi/colls/allgatherv/allgatherv-ring.cpp
+++ b/src/smpi/colls/allgatherv/allgatherv-ring.cpp
@@ -61,7 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *   recv_type: data type of elements being received
  *   comm: communication
  * Descrp: Function works in P - 1 steps. In step i, node j - i -> j -> j+ i.
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
  ****************************************************************************/
 
 namespace simgrid{
diff --git a/src/smpi/colls/allreduce/allreduce-lr.cpp b/src/smpi/colls/allreduce/allreduce-lr.cpp
index 380e09322a..9df5ace617 100644
--- a/src/smpi/colls/allreduce/allreduce-lr.cpp
+++ b/src/smpi/colls/allreduce/allreduce-lr.cpp
@@ -7,7 +7,7 @@
 #include "../colls_private.hpp"
 
 /* IMPLEMENTED BY PITCH PATARASUK
-   Non-topoloty-specific all-reduce operation designed bandwidth optimally
+   Non-topology-specific all-reduce operation designed bandwidth optimally
    Bug fixing by Xin Yuan, 04/04/2008
 */
 
diff --git a/src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp b/src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp
index 4fc72fe6cc..5c29b307be 100644
--- a/src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp
+++ b/src/smpi/colls/allreduce/allreduce-mvapich-rs.cpp
@@ -84,7 +84,7 @@ int Coll_allreduce_mvapich2_rs::allreduce(const void *sendbuf,
                                      COLL_TAG_ALLREDUCE, comm);
 
             /* temporarily set the rank to -1 so that this
-               process does not pariticipate in recursive
+               process does not participate in recursive
                doubling */
             newrank = -1;
         } else {
diff --git a/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp b/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp
index 946a409b8a..48ce160a67 100644
--- a/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp
+++ b/src/smpi/colls/allreduce/allreduce-ompi-ring-segmented.cpp
@@ -268,7 +268,7 @@ Coll_allreduce_ompi_ring_segmented::allreduce(const void *sbuf, void *rbuf, int
          - wait on block (r + 1)
          - compute on block (r + 1)
          - send block (r + 1) to rank (r + 1)
-         Note that we must be careful when computing the begining of buffers and
+         Note that we must be careful when computing the beginning of buffers and
          for send operations and computation we must compute the exact block size.
       */
       send_to = (rank + 1) % size;
diff --git a/src/smpi/colls/allreduce/allreduce-rab-rdb.cpp b/src/smpi/colls/allreduce/allreduce-rab-rdb.cpp
index 48b583c84a..d9f4d2c438 100644
--- a/src/smpi/colls/allreduce/allreduce-rab-rdb.cpp
+++ b/src/smpi/colls/allreduce/allreduce-rab-rdb.cpp
@@ -46,7 +46,7 @@ int Coll_allreduce_rab_rdb::allreduce(const void *sbuff, void *rbuff, int count,
       Request::send(rbuff, count, dtype, rank + 1, tag, comm);
 
       // temporarily set the rank to -1 so that this
-      // process does not pariticipate in recursive
+      // process does not participate in recursive
       // doubling
       newrank = -1;
     } else                      // odd
diff --git a/src/smpi/colls/allreduce/allreduce-rdb.cpp b/src/smpi/colls/allreduce/allreduce-rdb.cpp
index 6041a42946..ba19511b29 100644
--- a/src/smpi/colls/allreduce/allreduce-rdb.cpp
+++ b/src/smpi/colls/allreduce/allreduce-rdb.cpp
@@ -55,7 +55,7 @@ int Coll_allreduce_rdb::allreduce(const void *sbuff, void *rbuff, int count,
       Request::send(rbuff, count, dtype, rank + 1, tag, comm);
 
       // temporarily set the rank to -1 so that this
-      // process does not pariticipate in recursive
+      // process does not participate in recursive
       // doubling
       newrank = -1;
     } else                      // odd
@@ -99,7 +99,7 @@ int Coll_allreduce_rdb::allreduce(const void *sbuff, void *rbuff, int count,
       // recvbuf contains data accumulated so far
 
       // op is commutative OR the order is already right
-      // we assume it is commuttive op
+      // we assume it is commutative op
       //      if (op -> op_commute  || (dst < rank))
       if ((dst < rank)) {
         if(op!=MPI_OP_NULL) op->apply( tmp_buf, rbuff, &count, dtype);
diff --git a/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp b/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
index d9156b3674..eb85fbd7b6 100644
--- a/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-binomial-pipeline.cpp
@@ -6,14 +6,12 @@
 
 #include "../colls_private.hpp"
 /* IMPLEMENTED BY PITCH PATARASUK
-   Non-topoloty-specific (however, number of cores/node need to be changed)
+   Non-topology-specific (however, number of cores/node need to be changed)
    all-reduce operation designed for smp clusters
    It uses 2-layer communication: binomial for both intra-communication
    inter-communication
    The communication are done in a pipeline fashion */
 
-
-
 /* this is a default segment size for pipelining,
    but it is typically passed as a command line argument */
 int allreduce_smp_binomial_pipeline_segment_size = 4096;
diff --git a/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp b/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
index 16f60d6eec..cea1643d48 100644
--- a/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-binomial.cpp
@@ -6,12 +6,11 @@
 
 #include "../colls_private.hpp"
 /* IMPLEMENTED BY PITCH PATARASUK
-   Non-topoloty-specific (however, number of cores/node need to be changed)
+   Non-topology-specific (however, number of cores/node need to be changed)
    all-reduce operation designed for smp clusters
    It uses 2-layer communication: binomial for both intra-communication
    inter-communication*/
 
-
 /* ** NOTE **
    Use -DMPICH2 if this code does not compile.
    MPICH1 code also work on MPICH2 on our cluster and the performance are similar.
diff --git a/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp b/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
index 1e7504c957..12f64483fa 100644
--- a/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
+++ b/src/smpi/colls/allreduce/allreduce-smp-rdb.cpp
@@ -6,12 +6,11 @@
 
 #include "../colls_private.hpp"
 /* IMPLEMENTED BY PITCH PATARASUK
-   Non-topoloty-specific (however, number of cores/node need to be changed)
+   Non-topology-specific (however, number of cores/node need to be changed)
    all-reduce operation designed for smp clusters
    It uses 2-layer communication: binomial for intra-communication
    and rdb for inter-communication*/
 
-
 /* ** NOTE **
    Use -DMPICH2 if this code does not compile.
    MPICH1 code also work on MPICH2 on our cluster and the performance are similar.
diff --git a/src/smpi/colls/alltoall/alltoall-2dmesh.cpp b/src/smpi/colls/alltoall/alltoall-2dmesh.cpp
index 7d9a906c5d..918a242b89 100644
--- a/src/smpi/colls/alltoall/alltoall-2dmesh.cpp
+++ b/src/smpi/colls/alltoall/alltoall-2dmesh.cpp
@@ -27,7 +27,7 @@
            then in the y dimension. Each node then extracts the needed data.
            The communication in each dimension follows "simple."
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
 ****************************************************************************/
 static int alltoall_check_is_2dmesh(int num, int *i, int *j)
diff --git a/src/smpi/colls/alltoall/alltoall-3dmesh.cpp b/src/smpi/colls/alltoall/alltoall-3dmesh.cpp
index 24f9def3b9..4bf3d39ea1 100644
--- a/src/smpi/colls/alltoall/alltoall-3dmesh.cpp
+++ b/src/smpi/colls/alltoall/alltoall-3dmesh.cpp
@@ -27,7 +27,7 @@
            y dimension, then in z dimension. Each node then extracts the
            needed data. The communication in all dimension is simple.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 ****************************************************************************/
 
 static int alltoall_check_is_3dmesh(int num, int *i, int *j, int *k)
diff --git a/src/smpi/colls/alltoall/alltoall-bruck.cpp b/src/smpi/colls/alltoall/alltoall-bruck.cpp
index cd524443e1..568ee256b7 100644
--- a/src/smpi/colls/alltoall/alltoall-bruck.cpp
+++ b/src/smpi/colls/alltoall/alltoall-bruck.cpp
@@ -21,7 +21,7 @@
 
  * Descrp: Function realizes the alltoall operation using the bruck algorithm.
 
- * Auther: MPICH / modified by Ahmad Faraj
+ * Author: MPICH / modified by Ahmad Faraj
 
  ****************************************************************************/
 
diff --git a/src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp b/src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp
index 35bc2933db..bcaaaf2336 100644
--- a/src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-pair-light-barrier.cpp
@@ -24,7 +24,7 @@
            with node i ^ j. Light barriers are inserted between
            communications in different phases.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp b/src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp
index 2e9e926e59..2dcf9e330d 100644
--- a/src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-pair-mpi-barrier.cpp
@@ -24,7 +24,7 @@
            phases, nodes in pair communicate their data. MPI barriers are
            inserted between each two phases.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp b/src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp
index b427fca19b..a440cd83f3 100644
--- a/src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-pair-one-barrier.cpp
@@ -23,7 +23,7 @@
  * Descrp: Function works when P is power of two. In each phase of P - 1
            phases, nodes in pair communicate their data.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoall/alltoall-pair.cpp b/src/smpi/colls/alltoall/alltoall-pair.cpp
index bd1095d820..25ba861d49 100644
--- a/src/smpi/colls/alltoall/alltoall-pair.cpp
+++ b/src/smpi/colls/alltoall/alltoall-pair.cpp
@@ -25,7 +25,7 @@
  * Descrp: Function works when P is power of two. In each phase of P - 1
            phases, nodes in pair communicate their data.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoall/alltoall-rdb.cpp b/src/smpi/colls/alltoall/alltoall-rdb.cpp
index f2a0c32e89..942288e421 100644
--- a/src/smpi/colls/alltoall/alltoall-rdb.cpp
+++ b/src/smpi/colls/alltoall/alltoall-rdb.cpp
@@ -25,7 +25,7 @@
  * Descrp: Function realizes the allgather operation using the recursive
            doubling algorithm.
 
- * Auther: MPICH / slightly modified by Ahmad Faraj.
+ * Author: MPICH / slightly modified by Ahmad Faraj.
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp b/src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp
index 7aa92f9193..39fbde1ca2 100644
--- a/src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-ring-light-barrier.cpp
@@ -24,7 +24,7 @@
            Light barriers are inserted between communications in different
            phases.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp b/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
index c8e4c34e51..2c61768f98 100644
--- a/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-ring-mpi-barrier.cpp
@@ -23,7 +23,7 @@
  * Descrp: Function works in P - 1 steps. In step i, node j - i -> j -> j + i.
            MPI barriers are added between each two phases.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp b/src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp
index be7e0896ec..c52d5c59cb 100644
--- a/src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp
+++ b/src/smpi/colls/alltoall/alltoall-ring-one-barrier.cpp
@@ -22,7 +22,7 @@
 
  * Descrp: Function works in P - 1 steps. In step i, node j - i -> j -> j + i.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoall/alltoall-ring.cpp b/src/smpi/colls/alltoall/alltoall-ring.cpp
index 8144198205..6d51492d82 100644
--- a/src/smpi/colls/alltoall/alltoall-ring.cpp
+++ b/src/smpi/colls/alltoall/alltoall-ring.cpp
@@ -22,7 +22,7 @@
 
  * Descrp: Function works in P - 1 steps. In step i, node j - i -> j -> j + i.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp
index b5d4073a25..448ca1a6a4 100644
--- a/src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-pair-light-barrier.cpp
@@ -24,7 +24,7 @@
            with node i ^ j. Light barriers are inserted between
            communications in different phases.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
index d942226807..b63b487723 100644
--- a/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-pair-mpi-barrier.cpp
@@ -24,7 +24,7 @@
            phases, nodes in pair communicate their data. MPI barriers are
            inserted between each two phases.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp
index f2298f4faf..3a78afe0e7 100644
--- a/src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-pair-one-barrier.cpp
@@ -23,7 +23,7 @@
  * Descrp: Function works when P is power of two. In each phase of P - 1
            phases, nodes in pair communicate their data.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoallv/alltoallv-pair.cpp b/src/smpi/colls/alltoallv/alltoallv-pair.cpp
index 8dfd02f79d..1492073398 100644
--- a/src/smpi/colls/alltoallv/alltoallv-pair.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-pair.cpp
@@ -24,7 +24,7 @@
  * Descrp: Function works when P is power of two. In each phase of P - 1
            phases, nodes in pair communicate their data.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp
index a1773f131b..87ccfdcca4 100644
--- a/src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-ring-light-barrier.cpp
@@ -24,7 +24,7 @@
            Light barriers are inserted between communications in different
            phases.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
index 211347bc16..69202b4a1d 100644
--- a/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-ring-mpi-barrier.cpp
@@ -23,7 +23,7 @@
  * Descrp: Function works in P - 1 steps. In step i, node j - i -> j -> j + i.
            MPI barriers are added between each two phases.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp b/src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp
index de58b9fc5f..09e712de51 100644
--- a/src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-ring-one-barrier.cpp
@@ -22,7 +22,7 @@
 
  * Descrp: Function works in P - 1 steps. In step i, node j - i -> j -> j + i.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/alltoallv/alltoallv-ring.cpp b/src/smpi/colls/alltoallv/alltoallv-ring.cpp
index 88e27c0093..fbb0e53d12 100644
--- a/src/smpi/colls/alltoallv/alltoallv-ring.cpp
+++ b/src/smpi/colls/alltoallv/alltoallv-ring.cpp
@@ -22,7 +22,7 @@
 
  * Descrp: Function works in P - 1 steps. In step i, node j - i -> j -> j + i.
 
- * Auther: Ahmad Faraj
+ * Author: Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/barrier/barrier-ompi.cpp b/src/smpi/colls/barrier/barrier-ompi.cpp
index 500d37ad70..e87e5fd504 100644
--- a/src/smpi/colls/barrier/barrier-ompi.cpp
+++ b/src/smpi/colls/barrier/barrier-ompi.cpp
@@ -39,7 +39,7 @@
 /*
  * Simple double ring version of barrier
  *
- * synchronous gurantee made by last ring of sends are synchronous
+ * synchronous guarantee made by last ring of sends are synchronous
  *
  */
 namespace simgrid{
diff --git a/src/smpi/colls/bcast/bcast-NTSB.cpp b/src/smpi/colls/bcast/bcast-NTSB.cpp
index 9a112c331a..8decb7bc98 100644
--- a/src/smpi/colls/bcast/bcast-NTSB.cpp
+++ b/src/smpi/colls/bcast/bcast-NTSB.cpp
@@ -75,13 +75,13 @@ int Coll_bcast_NTSB::bcast(void *buf, int count, MPI_Datatype datatype,
       Request::recv(buf, count, datatype, from, tag, comm, &status);
     }
 
-    /* case: intermidiate node with only left child ==> relay message */
+    /* case: intermediate node with only left child ==> relay message */
     else if (to_right == -1) {
       Request::recv(buf, count, datatype, from, tag, comm, &status);
       Request::send(buf, count, datatype, to_left, tag, comm);
     }
 
-    /* case: intermidiate node with both left and right children ==> relay message */
+    /* case: intermediate node with both left and right children ==> relay message */
     else {
       Request::recv(buf, count, datatype, from, tag, comm, &status);
       Request::send(buf, count, datatype, to_left, tag, comm);
@@ -128,7 +128,7 @@ int Coll_bcast_NTSB::bcast(void *buf, int count, MPI_Datatype datatype,
       Request::waitall((pipe_length), recv_request_array, recv_status_array);
     }
 
-    /* case: intermidiate node with only left child ==> relay message */
+    /* case: intermediate node with only left child ==> relay message */
     else if (to_right == -1) {
       for (i = 0; i < pipe_length; i++) {
         recv_request_array[i] = Request::irecv((char *) buf + (i * increment), segment, datatype, from,
@@ -142,7 +142,7 @@ int Coll_bcast_NTSB::bcast(void *buf, int count, MPI_Datatype datatype,
       Request::waitall(pipe_length, send_request_array, send_status_array);
 
     }
-    /* case: intermidiate node with both left and right children ==> relay message */
+    /* case: intermediate node with both left and right children ==> relay message */
     else {
       for (i = 0; i < pipe_length; i++) {
         recv_request_array[i] = Request::irecv((char *) buf + (i * increment), segment, datatype, from,
diff --git a/src/smpi/colls/bcast/bcast-binomial-tree.cpp b/src/smpi/colls/bcast/bcast-binomial-tree.cpp
index eff2f1aaf1..251ed58e09 100644
--- a/src/smpi/colls/bcast/bcast-binomial-tree.cpp
+++ b/src/smpi/colls/bcast/bcast-binomial-tree.cpp
@@ -64,7 +64,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  * Descrp: broadcasts using a bionomial tree.
 
- * Auther: MPIH / modified by Ahmad Faraj
+ * Author: MPIH / modified by Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp b/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp
index 578cd89c67..be50cd2875 100644
--- a/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp
+++ b/src/smpi/colls/bcast/bcast-ompi-split-bintree.cpp
@@ -185,43 +185,38 @@ Coll_bcast_ompi_split_bintree::bcast ( void* buffer,
 
     /* intermediate nodes code */
     else if( tree->tree_nextsize > 0 ) {
-        /* Intermediate nodes:
-         * It will receive segments only from one half of the data.
-         * Which one is determined by whether the node belongs to the "left" or "right"
-         * subtree. Topoloby building function builds binary tree such that
-         * odd "shifted ranks" ((rank + size - root)%size) are on the left subtree,
-         * and even on the right subtree.
-         *
-         * Create the pipeline. We first post the first receive, then in the loop we
-         * post the next receive and after that wait for the previous receive to complete
-         * and we disseminating the data to all children.
-         */
-        sendcount[lr] = segcount[lr];
-        base_req=Request::irecv(tmpbuf[lr], sendcount[lr], datatype,
-                           tree->tree_prev, COLL_TAG_BCAST,
-                           comm);
+      /* Intermediate nodes:
+       * It will receive segments only from one half of the data.
+       * Which one is determined by whether the node belongs to the "left" or "right"
+       * subtree. Topology building function builds binary tree such that
+       * odd "shifted ranks" ((rank + size - root)%size) are on the left subtree,
+       * and even on the right subtree.
+       *
+       * Create the pipeline. We first post the first receive, then in the loop we
+       * post the next receive and after that wait for the previous receive to complete
+       * and we disseminating the data to all children.
+       */
+      sendcount[lr] = segcount[lr];
+      base_req      = Request::irecv(tmpbuf[lr], sendcount[lr], datatype, tree->tree_prev, COLL_TAG_BCAST, comm);
+
+      for (segindex = 1; segindex < num_segments[lr]; segindex++) {
+        /* determine how many elements to expect in this round */
+        if (segindex == (num_segments[lr] - 1))
+          sendcount[lr] = counts[lr] - segindex * segcount[lr];
+        /* post new irecv */
+        new_req = Request::irecv(tmpbuf[lr] + realsegsize[lr], sendcount[lr], datatype, tree->tree_prev, COLL_TAG_BCAST,
+                                 comm);
+
+        /* wait for and forward current segment */
+        Request::waitall(1, &base_req, MPI_STATUSES_IGNORE);
+        for (i = 0; i < tree->tree_nextsize; i++) { /* send data to children (segcount[lr]) */
+          Request::send(tmpbuf[lr], segcount[lr], datatype, tree->tree_next[i], COLL_TAG_BCAST, comm);
+        } /* end of for each child */
 
-        for( segindex = 1; segindex < num_segments[lr]; segindex++ ) {
-            /* determine how many elements to expect in this round */
-            if( segindex == (num_segments[lr] - 1))
-                sendcount[lr] = counts[lr] - segindex*segcount[lr];
-            /* post new irecv */
-            new_req = Request::irecv( tmpbuf[lr] + realsegsize[lr], sendcount[lr],
-                                datatype, tree->tree_prev, COLL_TAG_BCAST,
-                                comm);
-
-            /* wait for and forward current segment */
-            Request::waitall( 1, &base_req, MPI_STATUSES_IGNORE );
-            for( i = 0; i < tree->tree_nextsize; i++ ) {  /* send data to children (segcount[lr]) */
-                Request::send( tmpbuf[lr], segcount[lr], datatype,
-                                   tree->tree_next[i], COLL_TAG_BCAST,
-                                   comm);
-            } /* end of for each child */
-
-            /* upate the base request */
-            base_req = new_req;
-            /* go to the next buffer (ie. the one corresponding to the next recv) */
-            tmpbuf[lr] += realsegsize[lr];
+        /* upate the base request */
+        base_req = new_req;
+        /* go to the next buffer (ie. the one corresponding to the next recv) */
+        tmpbuf[lr] += realsegsize[lr];
         } /* end of for segindex */
 
         /* wait for the last segment and forward current segment */
diff --git a/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp
index 1a3cb9b2bd..41844ced4e 100644
--- a/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp
+++ b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp
@@ -64,7 +64,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  * Descrp: broadcasts using a scatter followed by LR allgather.
 
- * Auther: MPIH / modified by Ahmad Faraj
+ * Author: MPIH / modified by Ahmad Faraj
 
  ****************************************************************************/
 namespace simgrid{
diff --git a/src/smpi/colls/coll_tuned_topo.cpp b/src/smpi/colls/coll_tuned_topo.cpp
index 0236803ca9..ae0ec44ce7 100644
--- a/src/smpi/colls/coll_tuned_topo.cpp
+++ b/src/smpi/colls/coll_tuned_topo.cpp
@@ -327,7 +327,7 @@ ompi_coll_tree_t*
 ompi_coll_tuned_topo_build_bmtree( MPI_Comm comm,
                                    int root )
 {
-    int childs = 0;
+    int children = 0;
     int rank;
     int size;
     int mask = 1;
@@ -372,22 +372,22 @@ ompi_coll_tuned_topo_build_bmtree( MPI_Comm comm,
         if( remote >= size ) remote -= size;
         bmtree->tree_prev = remote;
     }
-    /* And now let's fill my childs */
+    /* And now let's fill my children */
     while( mask < size ) {
         remote = (index ^ mask);
         if( remote >= size ) break;
         remote += root;
         if( remote >= size ) remote -= size;
-        if (childs==MAXTREEFANOUT) {
-            XBT_DEBUG("coll:tuned:topo:build_bmtree max fanout incorrect %d needed %d", MAXTREEFANOUT, childs);
+        if (children==MAXTREEFANOUT) {
+            XBT_DEBUG("coll:tuned:topo:build_bmtree max fanout incorrect %d needed %d", MAXTREEFANOUT, children);
             delete bmtree;
             return NULL;
         }
-        bmtree->tree_next[childs] = remote;
+        bmtree->tree_next[children] = remote;
         mask <<= 1;
-        childs++;
+        children++;
     }
-    bmtree->tree_nextsize = childs;
+    bmtree->tree_nextsize = children;
     bmtree->tree_root     = root;
     return bmtree;
 }
@@ -408,7 +408,7 @@ ompi_coll_tuned_topo_build_bmtree( MPI_Comm comm,
  */
 ompi_coll_tree_t* ompi_coll_tuned_topo_build_in_order_bmtree(MPI_Comm comm, int root)
 {
-    int childs = 0;
+    int children = 0;
     int rank, vrank;
     int size;
     int mask = 1;
@@ -449,17 +449,17 @@ ompi_coll_tree_t* ompi_coll_tuned_topo_build_in_order_bmtree(MPI_Comm comm, int
         bmtree->tree_prev = (remote + root) % size;
         break;
       } else if (remote < size) {
-        bmtree->tree_next[childs] = (remote + root) % size;
-        childs++;
-        if (childs == MAXTREEFANOUT) {
-          XBT_DEBUG("coll:tuned:topo:build_bmtree max fanout incorrect %d needed %d", MAXTREEFANOUT, childs);
+        bmtree->tree_next[children] = (remote + root) % size;
+        children++;
+        if (children == MAXTREEFANOUT) {
+          XBT_DEBUG("coll:tuned:topo:build_bmtree max fanout incorrect %d needed %d", MAXTREEFANOUT, children);
           delete bmtree;
           return NULL;
         }
       }
       mask <<= 1;
     }
-    bmtree->tree_nextsize = childs;
+    bmtree->tree_nextsize = children;
     bmtree->tree_root     = root;
 
     return bmtree;
diff --git a/src/smpi/colls/reduce/reduce-ompi.cpp b/src/smpi/colls/reduce/reduce-ompi.cpp
index ce4d8d5f68..dd72d7bc29 100644
--- a/src/smpi/colls/reduce/reduce-ompi.cpp
+++ b/src/smpi/colls/reduce/reduce-ompi.cpp
@@ -80,7 +80,7 @@ int smpi_coll_tuned_ompi_reduce_generic(const void* sendbuf, void* recvbuf, int
         ptrdiff_t true_extent, real_segment_size;
         true_extent=datatype->get_extent();
 
-        /* handle non existant recv buffer (i.e. its NULL) and
+        /* handle non existent recv buffer (i.e. its NULL) and
            protect the recv buffer on non-root nodes */
         accumbuf = static_cast<unsigned char*>(recvbuf);
         if (nullptr == accumbuf || root != rank) {
@@ -95,7 +95,7 @@ int smpi_coll_tuned_ompi_reduce_generic(const void* sendbuf, void* recvbuf, int
         }
 
         /* If this is a non-commutative operation we must copy
-           sendbuf to the accumbuf, in order to simplfy the loops */
+           sendbuf to the accumbuf, in order to simplify the loops */
         if ((op != MPI_OP_NULL && not op->is_commutative())) {
           Datatype::copy(sendtmpbuf, original_count, datatype, accumbuf, original_count, datatype);
         }
@@ -474,7 +474,7 @@ int Coll_reduce_ompi_binomial::reduce(const void *sendbuf, void *recvbuf,
  * reduce_intra_in_order_binary
  *
  * Function:      Logarithmic reduce operation for non-commutative operations.
- * Acecpts:       same as MPI_Reduce()
+ * Accepts:       same as MPI_Reduce()
  * Returns:       MPI_SUCCESS or error code
  */
 int Coll_reduce_ompi_in_order_binary::reduce(const void *sendbuf, void *recvbuf,
diff --git a/src/smpi/colls/reduce/reduce-rab.cpp b/src/smpi/colls/reduce/reduce-rab.cpp
index 351979c61b..ef73930a40 100644
--- a/src/smpi/colls/reduce/reduce-rab.cpp
+++ b/src/smpi/colls/reduce/reduce-rab.cpp
@@ -46,7 +46,7 @@
 /* Fast reduce and allreduce algorithm for longer buffers and predefined
    operations.
 
-   This algorithm is explaned with the example of 13 nodes.
+   This algorithm is explained with the example of 13 nodes.
    The nodes are numbered   0, 1, 2, ... 12.
    The sendbuf content is   a, b, c, ...  m.
    The buffer array is notated with ABCDEFGH, this means that
@@ -65,7 +65,7 @@
 
    Exa.: size=13 ==> n=3, r=5  (i.e. size == 13 == 2**n+r ==  2**3 + 5)
 
-   The algoritm needs for the execution of one Colls::reduce
+   The algorithm needs for the execution of one Colls::reduce
 
    - for r==0
      exec_time = n*(L1+L2)     + buf_lng * (1-1/2**n) * (T1 + T2 + O/d)
@@ -376,7 +376,7 @@ Benchmark results on CRAY T3E
    2) This line shows the limit for the count argument.
       If count < limit then the vendor protocol is used,
       otherwise the new protocol is used (see variable Ldb).
-   3) These lines show the bandwidth (=bufer length / execution time)
+   3) These lines show the bandwidth (= buffer length / execution time)
       for both protocols.
    4) This line shows that the limit is choosen well if the ratio is
       between 0.95 (loosing 5% for buffer length near and >=limit)
@@ -635,7 +635,7 @@ static int MPI_I_anyReduce(const void* Sendbuf, void* Recvbuf, int count, MPI_Da
 #   endif
     n = 0; x_size = 1;
     while (2*x_size <= size) { n++; x_size = x_size * 2; }
-    /* x_sixe == 2**n */
+    /* x_size == 2**n */
     r = size - x_size;
 
   /*...step 2 */
diff --git a/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp b/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
index 905d637ccc..93ae0dc48e 100644
--- a/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
+++ b/src/smpi/colls/reduce_scatter/reduce_scatter-ompi.cpp
@@ -441,7 +441,7 @@ Coll_reduce_scatter_ompi_ring::reduce_scatter(const void *sbuf, void *rbuf, cons
        - wait on block (r)
        - compute on block (r)
        - copy block (r) to rbuf
-       Note that we must be careful when computing the begining of buffers and
+       Note that we must be careful when computing the beginning of buffers and
        for send operations and computation we must compute the exact block size.
     */
     send_to = (rank + 1) % size;
diff --git a/src/smpi/colls/smpi_mvapich2_selector.cpp b/src/smpi/colls/smpi_mvapich2_selector.cpp
index bc6c2c596d..d7840cf4dc 100644
--- a/src/smpi/colls/smpi_mvapich2_selector.cpp
+++ b/src/smpi/colls/smpi_mvapich2_selector.cpp
@@ -359,7 +359,7 @@ int Coll_allreduce_mvapich2::allreduce(const void *sendbuf,
         range++;
     }
     /* Search for corresponding inter-leader function */
-    /* skip mcast poiters if mcast is not available */
+    /* skip mcast pointers if mcast is not available */
     if(mv2_allreduce_thresholds_table[range].mcast_enabled != 1){
         while ((range_threshold < (mv2_allreduce_thresholds_table[range].size_inter_table - 1))
             && ((mv2_allreduce_thresholds_table[range].
diff --git a/src/smpi/include/smpi_comm.hpp b/src/smpi/include/smpi_comm.hpp
index 828b752367..dacb7e3bf9 100644
--- a/src/smpi/include/smpi_comm.hpp
+++ b/src/smpi/include/smpi_comm.hpp
@@ -28,7 +28,7 @@ class Comm : public F2C, public Keyval{
   int is_uniform_;
   int* non_uniform_map_;        // set if smp nodes have a different number of processes allocated
   int is_blocked_;              // are ranks allocated on the same smp node contiguous ?
-  int is_smp_comm_;             // set to 0 in case this is already an intra-comm or a leader-comm to avoid recursivity
+  int is_smp_comm_;             // set to 0 in case this is already an intra-comm or a leader-comm to avoid recursion
   std::list<MPI_Win> rma_wins_; // attached windows for synchronization.
   std::string name_;
   MPI_Info info_;
diff --git a/src/smpi/include/smpi_datatype.hpp b/src/smpi/include/smpi_datatype.hpp
index 01206eae64..09a821b650 100644
--- a/src/smpi/include/smpi_datatype.hpp
+++ b/src/smpi/include/smpi_datatype.hpp
@@ -13,7 +13,7 @@
 constexpr unsigned DT_FLAG_DESTROYED   = 0x0001; /**< user destroyed but some other layers still have a reference */
 constexpr unsigned DT_FLAG_COMMITED    = 0x0002; /**< ready to be used for a send/recv operation */
 constexpr unsigned DT_FLAG_CONTIGUOUS  = 0x0004; /**< contiguous datatype */
-constexpr unsigned DT_FLAG_OVERLAP     = 0x0008; /**< datatype is unpropper for a recv operation */
+constexpr unsigned DT_FLAG_OVERLAP     = 0x0008; /**< datatype is unproper for a recv operation */
 constexpr unsigned DT_FLAG_USER_LB     = 0x0010; /**< has a user defined LB */
 constexpr unsigned DT_FLAG_USER_UB     = 0x0020; /**< has a user defined UB */
 constexpr unsigned DT_FLAG_PREDEFINED  = 0x0040; /**< cannot be removed: initial and predefined datatypes */
diff --git a/src/smpi/include/smpi_file.hpp b/src/smpi/include/smpi_file.hpp
index 3feb57f696..ccb8f7fa96 100644
--- a/src/smpi/include/smpi_file.hpp
+++ b/src/smpi/include/smpi_file.hpp
@@ -121,7 +121,7 @@ class File{
       if((my_chunk_start>=min_offsets[i] && my_chunk_start < max_offsets[i])||
           ((my_chunk_end<=max_offsets[i]) && my_chunk_end> min_offsets[i])){
         send_sizes[i]=(std::min(max_offsets[i]-1, my_chunk_end-1)-std::max(min_offsets[i], my_chunk_start));
-        //store min and max offest to actually read
+        // store min and max offset to actually read
         min_offset=std::min(min_offset, min_offsets[i]);
         total_sent+=send_sizes[i];
         XBT_CDEBUG(smpi_pmpi, "will have to send %d bytes to %d", send_sizes[i], i);
diff --git a/src/smpi/internals/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp
index 84fbe20aa8..a38dd6e0ac 100644
--- a/src/smpi/internals/smpi_bench.cpp
+++ b/src/smpi/internals/smpi_bench.cpp
@@ -39,7 +39,7 @@ double smpi_host_speed;
 SharedMallocType smpi_cfg_shared_malloc = SharedMallocType::GLOBAL;
 double smpi_total_benched_time = 0;
 
-// Private execute_flops used by smpi_execute and spmi_execute_benched
+// Private execute_flops used by smpi_execute and smpi_execute_benched
 void private_execute_flops(double flops) {
   xbt_assert(flops >= 0, "You're trying to execute a negative amount of flops (%f)!", flops);
   XBT_DEBUG("Handle real computation time: %f flops", flops);
diff --git a/src/smpi/internals/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp
index 0142abdbbf..93114a32d3 100644
--- a/src/smpi/internals/smpi_replay.cpp
+++ b/src/smpi/internals/smpi_replay.cpp
@@ -61,7 +61,7 @@ public:
 };
 }
 
-typedef std::tuple</*sender*/ int, /* reciever */ int, /* tag */int> req_key_t;
+typedef std::tuple</*sender*/ int, /* receiver */ int, /* tag */ int> req_key_t;
 typedef std::unordered_map<req_key_t, MPI_Request, hash_tuple::hash<std::tuple<int,int,int>>> req_storage_t;
 
 void log_timed_action(simgrid::xbt::ReplayAction& action, double clock)
diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp
index ed24882e91..c404c1bf14 100644
--- a/src/smpi/mpi/smpi_comm.cpp
+++ b/src/smpi/mpi/smpi_comm.cpp
@@ -384,7 +384,7 @@ void Comm::init_smp(){
     // we need to switch as the called function may silently touch global variables
     smpi_switch_data_segment(s4u::Actor::self());
   }
-  //identify neighbours in comm
+  // identify neighbors in comm
   MPI_Comm comm_intra = find_intra_comm(&leader);
 
 
diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp
index 52fba4ae45..2a70952dab 100644
--- a/src/smpi/mpi/smpi_request.cpp
+++ b/src/smpi/mpi/smpi_request.cpp
@@ -50,7 +50,7 @@ Request::Request(const void* buf, int count, MPI_Datatype datatype, int src, int
       }
     }
   }
-  // This part handles the problem of non-contiguous memory (for the unserialisation at the reception)
+  // This part handles the problem of non-contiguous memory (for the unserialization at the reception)
   old_buf_  = old_buf;
   size_ = datatype->size() * count;
   datatype->ref();
@@ -129,7 +129,7 @@ int Request::match_recv(void* a, void* b, simgrid::kernel::activity::CommImpl*)
     if (req->detached_)
       ref->detached_sender_=req; //tie the sender to the receiver, as it is detached and has to be freed in the receiver
     if(req->cancelled_==0)
-      req->cancelled_=-1;//mark as uncancellable
+      req->cancelled_ = -1; // mark as uncancelable
     XBT_DEBUG("match succeeded");
     return 1;
   }else return 0;
@@ -155,7 +155,7 @@ int Request::match_send(void* a, void* b, simgrid::kernel::activity::CommImpl*)
     if (ref->detached_)
       req->detached_sender_=ref; //tie the sender to the receiver, as it is detached and has to be freed in the receiver
     if(req->cancelled_==0)
-      req->cancelled_=-1;//mark as uncancellable
+      req->cancelled_ = -1; // mark as uncancelable
     XBT_DEBUG("match succeeded");
     return 1;
   } else
@@ -861,7 +861,7 @@ void Request::finish_wait(MPI_Request* request, MPI_Status * status)
         }
 
         if(datatype->flags() & DT_FLAG_DERIVED){
-          // This part handles the problem of non-contignous memory the unserialization at the reception
+          // This part handles the problem of non-contiguous memory the unserialization at the reception
           if ((req->flags_ & MPI_REQ_RECV) && datatype->size() != 0)
             datatype->unserialize(req->buf_, req->old_buf_, req->real_size_/datatype->size() , req->op_);
           xbt_free(req->buf_);
diff --git a/src/smpi/mpi/smpi_win.cpp b/src/smpi/mpi/smpi_win.cpp
index 953584f621..f2adc8c99d 100644
--- a/src/smpi/mpi/smpi_win.cpp
+++ b/src/smpi/mpi/smpi_win.cpp
@@ -165,7 +165,7 @@ int Win::fence(int assert)
     bar_->wait();
     mut_->lock();
     // This (simulated) mutex ensures that no process pushes to the vector of requests during the waitall.
-    // Without this, the vector could get redimensionned when another process pushes.
+    // Without this, the vector could get redimensioned when another process pushes.
     // This would result in the array used by Request::waitall() to be invalidated.
     // Another solution would be to copy the data and cleanup the vector *before* Request::waitall
     std::vector<MPI_Request> *reqs = requests_;
@@ -334,8 +334,9 @@ int Win::accumulate(const void *origin_addr, int origin_count, MPI_Datatype orig
 
   void* recv_addr = static_cast<void*>(static_cast<char*>(recv_win->base_) + target_disp * recv_win->disp_unit_);
   XBT_DEBUG("Entering MPI_Accumulate to %d", target_rank);
-    //As the tag will be used for ordering of the operations, substract count from it (to avoid collisions with other SMPI tags, SMPI_RMA_TAG is set below all the other ones we use )
-    //prepare send_request
+  // As the tag will be used for ordering of the operations, subtract count from it (to avoid collisions with other
+  // SMPI tags, SMPI_RMA_TAG is set below all the other ones we use)
+  // prepare send_request
 
   MPI_Request sreq = Request::rma_send_init(origin_addr, origin_count, origin_datatype, comm_->rank(), target_rank,
                                             SMPI_RMA_TAG - 3 - count_, comm_, op);
diff --git a/src/smpi/smpirun.in b/src/smpi/smpirun.in
index 466610e323..99e1a94bd3 100755
--- a/src/smpi/smpirun.in
+++ b/src/smpi/smpirun.in
@@ -42,7 +42,7 @@ Options:
   -np <numprocs>             # use that amount of processes from the hostfile.
                              # By default, all processes of the hostfile are used.
   -no-privatize              # Disable the globals privatization, that is activated by default
-  -trace-ti                  # activate time independant tracing (for replay, default in smpi_simgrid.txt)
+  -trace-ti                  # activate time independent tracing (for replay, default in smpi_simgrid.txt)
   -trace                     # activate tracing (Paje, default in smpi_simgrid.trace)
   -trace-comment <comment>   # put a comment on the top of the trace file
   -trace-comment-file <file> # put file contents on the top of the trace file as comment
@@ -546,7 +546,7 @@ fi
 # * The job is launched in the background in order to be able to handle signals.
 #
 # * The FD 3 is used to temporarily store FD 1. This is because the shell connects FD 1 to /dev/null when the command
-#   is launched in the background: this can be overriden in bash but not in standard bourne shell.
+#   is launched in the background: this can be overridden in bash but not in standard bourne shell.
 exec 3<&0
 ${WRAPPER} "@SMPIMAIN@" ${EXEC} ${PRIVATIZE} ${TRACEOPTIONS} ${SIMOPTS} ${PLATFORMTMP} ${APPLICATIONTMP} <&3 3>&- &
 pid=$!
diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 7ad6573b60..3d67ee316f 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -60,7 +60,7 @@ private:
 
   /* Dynamic */
   double last_time_ = 0.0;             /*< Integral interval last point (discrete time) */
-  double total_    = 0.0;             /*< Integral total between 0 and last_pointn */
+  double total_     = 0.0;             /*< Integral total between 0 and last point */
 
   std::unique_ptr<CpuTiProfile> profile_ = nullptr;
   profile::Profile* speed_profile_       = nullptr;
diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 9945dbde76..36a5c499bb 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -396,7 +396,8 @@ NetworkWifiLink::NetworkWifiLink(NetworkCm02Model* model, const std::string& nam
                                  s4u::Link::SharingPolicy policy, lmm::System* system)
     : NetworkCm02Link(
           model, name, 1 / sg_bandwidth_factor, 0, policy,
-          system) // Since link use bw*sg_bandwidth_factor we should divise in order to as 1 as bound in the lmm system
+          system) // Since link uses bw*sg_bandwidth_factor we should divide by sg_bw_factor to ensure that we have 1 as
+                  // a bound in the lmm system
 {
   for (auto bandwidth : bandwidths) {
     bandwidths_.push_back({bandwidth, 1.0, nullptr});
diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 01a34f9bdd..01bce47a88 100644
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -57,7 +57,7 @@ class NetworkWifiLink : public NetworkCm02Link {
   /** @brief Hold every rates association between host and links (host name, rates id) */
   std::map<xbt::string, int> host_rates_;
 
-  /** @brief A link can have several bandwith attach to it (mostly use by wifi model) */
+  /** @brief A link can have several bandwidth attach to it (mostly use by wifi model) */
   std::vector<Metric> bandwidths_;
 
 public:
diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index d5a4eccfec..b5b029f2a0 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -231,8 +231,8 @@ void NetworkNS3Model::update_actions_state(double now, double delta)
     SgFlow* sgFlow            = elm.second;
     NetworkNS3Action * action = sgFlow->action_;
     XBT_DEBUG("Processing socket %p (action %p)",sgFlow,action);
-    // Because NS3 stops as soon as a flow is finished, the other flows that ends at the same time may remains in an inconsistant state
-    // (i.e. remains_ == 0 but finished_ == false).
+    // Because NS3 stops as soon as a flow is finished, the other flows that ends at the same time may remains in an
+    // inconsistent state (i.e. remains_ == 0 but finished_ == false).
     // However, SimGrid considers sometimes that an action with remains_ == 0 is finished.
     // Thus, to avoid inconsistencies between SimGrid and NS3, set remains to 0 only when the flow is finished in NS3
     int remains = action->get_cost() - sgFlow->sent_bytes_;
diff --git a/src/surf/surf_interface.hpp b/src/surf/surf_interface.hpp
index ca08c2167f..ef686755f1 100644
--- a/src/surf/surf_interface.hpp
+++ b/src/surf/surf_interface.hpp
@@ -81,7 +81,7 @@ XBT_PUBLIC void surf_network_model_init_SMPI();
 /** @ingroup SURF_models
  *  @brief Same as network model 'LagrangeVelho', only with different correction factors.
  *
- * This model impelments a variant of the contention model on Infinband networks based on
+ * This model implements a variant of the contention model on Infiniband networks based on
  * the works of Jérôme Vienne : http://mescal.imag.fr/membres/jean-marc.vincent/index.html/PhD/Vienne.pdf
  *
  *  @see surf_host_model_init_IB()
@@ -115,7 +115,7 @@ XBT_PUBLIC void surf_network_model_init_Constant();
 /** @ingroup SURF_models
  *  @brief Initializes the platform with the network model CM02
  *
- *  You sould call this function by yourself only if you plan using surf_host_model_init_compound.
+ *  You should call this function by yourself only if you plan using surf_host_model_init_compound.
  *  See comments in the code for more information.
  */
 XBT_PUBLIC void surf_network_model_init_CM02();
@@ -136,7 +136,7 @@ XBT_PUBLIC void surf_network_model_init_NS3();
 /** @ingroup SURF_models
  *  @brief Initializes the platform with the current best network and cpu models at hand
  *
- *  This platform model seperates the host model and the network model.
+ *  This platform model separates the host model and the network model.
  *  The host model will be initialized with the model compound, the network model with the model LV08 (with cross
  *  traffic support) and the CPU model with the model Cas01.
  *  Such model is subject to modification with warning in the ChangeLog so monitor it!
diff --git a/src/surf/xml/simgrid.dtd b/src/surf/xml/simgrid.dtd
index ba78c64a3d..9e9eafb621 100644
--- a/src/surf/xml/simgrid.dtd
+++ b/src/surf/xml/simgrid.dtd
@@ -69,7 +69,7 @@ To upgrade your files, use the tool simgrid_update_xml
      - PLATFORM_DESCRIPTION -> PLATFORM
 
 * New in DTD version 1 (in SimGrid 3.3):
-   - DTD is now versionned with the version attribute of platform
+   - DTD is now versioned with the version attribute of platform
    - Unit change:
      - Link bandwidth: from Mb/s to b/s
      - CPU speed: from MFlop/s to Flop/s
diff --git a/src/surf/xml/simgrid_dtd.c b/src/surf/xml/simgrid_dtd.c
index 8f59eb2202..df742830e3 100644
--- a/src/surf/xml/simgrid_dtd.c
+++ b/src/surf/xml/simgrid_dtd.c
@@ -9642,7 +9642,7 @@ FAIL("Premature EOF: `</peer>' expected.");
   *      - ROUTE_ELEMENT ->  LINK:CTN (changed again in v3)
   *      - PLATFORM_DESCRIPTION -> PLATFORM
   * * New in DTD version 1 (in SimGrid 3.3):
-  *    - DTD is now versionned with the version attribute of platform
+  *    - DTD is now versioned with the version attribute of platform
   *    - Unit change:
   *      - Link bandwidth: from Mb/s to b/s
   *      - CPU speed: from MFlop/s to Flop/s
diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp
index 32c74e62eb..60d5f21fa0 100644
--- a/src/xbt/config.cpp
+++ b/src/xbt/config.cpp
@@ -328,7 +328,7 @@ void Config::alias(const std::string& realname, const std::string& aliasname)
   this->aliases.insert({aliasname, element});
 }
 
-/** @brief Dump a config set for debuging purpose
+/** @brief Dump a config set for debugging purpose
  *
  * @param name The name to give to this config set
  * @param indent what to write at the beginning of each line (right number of spaces)
diff --git a/src/xbt/config_test.cpp b/src/xbt/config_test.cpp
index 8b419246fe..f870f3365a 100644
--- a/src/xbt/config_test.cpp
+++ b/src/xbt/config_test.cpp
@@ -47,7 +47,7 @@ TEST_CASE("xbt::config: Configuration support", "config")
     int ival = simgrid::config::get_value<int>("speed");
     REQUIRE(ival == 42); // Unexpected value for speed
 
-    INFO("Access to a non-existant entry");
+    INFO("Access to a non-existent entry");
 
     REQUIRE_THROWS_AS(simgrid::config::set_parse("color:blue"), std::out_of_range);
 
diff --git a/src/xbt/dict.cpp b/src/xbt/dict.cpp
index f6742fb877..256c277615 100644
--- a/src/xbt/dict.cpp
+++ b/src/xbt/dict.cpp
@@ -180,7 +180,7 @@ void xbt_dict_set_ext(xbt_dict_t dict, const char* key, int key_len, void* data,
  * @param data the data to add in the dict
  * @param free_ctn unused parameter (kept for compatibility)
  *
- * set the @a data in the structure under the @a key, which is anull terminated string.
+ * set the @a data in the structure under the @a key, which is a null terminated string.
  */
 void xbt_dict_set(xbt_dict_t dict, const char *key, void *data, void_f_pvoid_t free_ctn)
 {
diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h
index 6d83ae4497..1fad6b410b 100644
--- a/src/xbt/dict_private.h
+++ b/src/xbt/dict_private.h
@@ -1,4 +1,4 @@
-/* dict_elm - elements of generic dictionnaries                             */
+/* dict_elm - elements of generic dictionaries                             */
 /* This file is not to be loaded from anywhere but dict.cpp                 */
 
 /* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved.          */
diff --git a/src/xbt/dict_test.cpp b/src/xbt/dict_test.cpp
index bd54663bb8..dd47436d1b 100644
--- a/src/xbt/dict_test.cpp
+++ b/src/xbt/dict_test.cpp
@@ -360,7 +360,7 @@ TEST_CASE("xbt::dict: dict data container", "dict")
     xbt_dict_free(&head);
   }
 
-  SECTION("Test dictionnary with int keys")
+  SECTION("Test dictionary with int keys")
   {
     xbt_dict_t dict = xbt_dict_new_homogeneous(nullptr);
     int count       = 500;
@@ -368,7 +368,7 @@ TEST_CASE("xbt::dict: dict data container", "dict")
     INFO("Insert elements");
     for (int i = 0; i < count; ++i)
       xbt_dict_set_ext(dict, (char*)&i, sizeof(i), (void*)(intptr_t)i, nullptr);
-    REQUIRE(xbt_dict_size(dict) == (unsigned)count); // Bad number of elements in the dictionnary
+    REQUIRE(xbt_dict_size(dict) == (unsigned)count); // Bad number of elements in the dictionary
 
     INFO("Check elements");
     for (int i = 0; i < count; ++i) {
diff --git a/src/xbt/dynar.cpp b/src/xbt/dynar.cpp
index 8216c76429..5c62e73975 100644
--- a/src/xbt/dynar.cpp
+++ b/src/xbt/dynar.cpp
@@ -216,7 +216,7 @@ void xbt_dynar_free_voidp(void* d)
 
 /** @brief Count of dynar's elements
  *
- * @param dynar the dynar we want to mesure
+ * @param dynar the dynar we want to measure
  */
 unsigned long xbt_dynar_length(const xbt_dynar_t dynar)
 {
@@ -522,7 +522,7 @@ void xbt_dynar_pop(xbt_dynar_t const dynar, void* const dst)
   xbt_dynar_remove_at(dynar, dynar->used - 1, dst);
 }
 
-/** @brief Add an element at the begining of the dynar.
+/** @brief Add an element at the beginning of the dynar.
  *
  * This is less efficient than xbt_dynar_push()
  */
diff --git a/src/xbt/dynar_test.cpp b/src/xbt/dynar_test.cpp
index dbd32ca0d1..5f642decae 100644
--- a/src/xbt/dynar_test.cpp
+++ b/src/xbt/dynar_test.cpp
@@ -119,7 +119,7 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar")
     for (int i = 0; i < NB_ELEM / 2; i++) {
       int val;
       xbt_dynar_shift(d, &val);
-      REQUIRE(val == i); // The retrieved value is not the same than the injected one at the begining
+      REQUIRE(val == i); // The retrieved value is not the same than the injected one at the beginning
     }
     for (int i = 999; i >= 0; i--) {
       int val;
@@ -272,7 +272,7 @@ TEST_CASE("xbt::dynar: generic C vector", "dynar")
     for (int i = 0; i < 2500; i++) {
       d1 = (double)i;
       xbt_dynar_shift(d, &d2);
-      REQUIRE(d1 == d2); // The retrieved value is not the same than the injected one at the begining
+      REQUIRE(d1 == d2); // The retrieved value is not the same than the injected one at the beginning
     }
     for (int i = 999; i >= 0; i--) {
       d1 = (double)i;
diff --git a/src/xbt/log_private.hpp b/src/xbt/log_private.hpp
index 0fcbc97cb7..01eb7263aa 100644
--- a/src/xbt/log_private.hpp
+++ b/src/xbt/log_private.hpp
@@ -24,7 +24,7 @@ struct xbt_log_layout_s {
  * @param cat the category (not only its name, but the variable)
  * @param parent the parent cat
  *
- * Programatically alter a category's parent (don't use).
+ * Programmatically alter a category's parent (don't use).
  */
 XBT_PUBLIC void xbt_log_parent_set(xbt_log_category_t cat, xbt_log_category_t parent);
 
diff --git a/src/xbt/mallocator.c b/src/xbt/mallocator.c
index 3469e222e7..e32dd7684a 100644
--- a/src/xbt/mallocator.c
+++ b/src/xbt/mallocator.c
@@ -90,7 +90,7 @@ static inline int xbt_mallocator_is_active(void) {
  *              mallocator is empty
  * @param free_f function to free an object of your datatype, called in @a xbt_mallocator_release() when the stack is
  *                full, and when the mallocator is freed.
- * @param reset_f function to reinitialise an object of your datatype, called when you extract an object from the
+ * @param reset_f function to reinitialize an object of your datatype, called when you extract an object from the
  *                mallocator (can be NULL)
  *
  * Create and initialize a new mallocator for a given datatype.
diff --git a/src/xbt/mmalloc/mm_module.c b/src/xbt/mmalloc/mm_module.c
index 825d992de7..b1c1551ac8 100644
--- a/src/xbt/mmalloc/mm_module.c
+++ b/src/xbt/mmalloc/mm_module.c
@@ -1,4 +1,4 @@
-/* Initialization for acces s to a mmap'd malloc managed region. */
+/* Initialization for access to a mmap'd malloc managed region. */
 
 /* Copyright (c) 2012-2019. The SimGrid Team.
  * All rights reserved.                                                     */
@@ -62,7 +62,7 @@
    starting at the specified address BASEADDR in the process address
    space.
 
-   The provided BASEADDR should be choosed carefully in order to avoid
+   The provided BASEADDR should be chosen carefully in order to avoid
    bumping into existing mapped regions or future mapped regions.
 
    On success, returns a "malloc descriptor" which is used in subsequent
diff --git a/src/xbt/mmalloc/mmalloc.c b/src/xbt/mmalloc/mmalloc.c
index 5294d699f8..ca3b40d788 100644
--- a/src/xbt/mmalloc/mmalloc.c
+++ b/src/xbt/mmalloc/mmalloc.c
@@ -47,7 +47,7 @@ static void *align(struct mdesc *mdp, size_t size)
   return (result);
 }
 
-/** Initialise heapinfo about the heapinfo pages :)
+/** Initialize heapinfo about the heapinfo pages :)
  *
  */
 static void initialize_heapinfo_heapinfo(xbt_mheap_t mdp)
@@ -120,7 +120,7 @@ static void *register_morecore(struct mdesc *mdp, size_t size)
     malloc_info* newinfo = (malloc_info*)align(mdp, newsize * sizeof(malloc_info));
     memcpy(newinfo, oldinfo, mdp->heapsize * sizeof(malloc_info));
 
-    /* Initialise the new blockinfo : */
+    /* Initialize the new blockinfo : */
     memset((char*) newinfo + mdp->heapsize * sizeof(malloc_info), 0,
       (newsize - mdp->heapsize)* sizeof(malloc_info));
 
@@ -180,7 +180,7 @@ static void mmalloc_mark_used(xbt_mheap_t mdp, size_t block, size_t nblocks, siz
   mdp->heapstats.bytes_used += nblocks * BLOCKSIZE;
 }
 
-/* Spliting mmalloc this way is mandated by a trick in mrealloc, that gives
+/* Splitting mmalloc this way is mandated by a trick in mrealloc, that gives
    back the memory of big blocks to the system before reallocating them: we don't
    want to loose the beginning of the area when this happens */
 void *mmalloc_no_memset(xbt_mheap_t mdp, size_t size)
diff --git a/src/xbt/mmalloc/mmorecore.c b/src/xbt/mmalloc/mmorecore.c
index e28edb75dc..fa83579acf 100644
--- a/src/xbt/mmalloc/mmorecore.c
+++ b/src/xbt/mmalloc/mmorecore.c
@@ -50,7 +50,7 @@
                              ? 0                                           \
                              : off)
 
-/** @brief Add memoty to this heap
+/** @brief Add memory to this heap
  *
  *  Get core for the memory region specified by MDP, using SIZE as the
  *  amount to either add to or subtract from the existing region.  Works
diff --git a/src/xbt/mmalloc/mmprivate.h b/src/xbt/mmalloc/mmprivate.h
index 46fe161fcc..7ed76dd99c 100644
--- a/src/xbt/mmalloc/mmprivate.h
+++ b/src/xbt/mmalloc/mmprivate.h
@@ -51,7 +51,7 @@
 #define BLOCKIFY(SIZE)  (((SIZE) + BLOCKSIZE - 1) / BLOCKSIZE)
 
 /* We keep fragment-specific meta-data for introspection purposes, and these
- * information are kept in fixed lenght arrays. Here is the computation of
+ * information are kept in fixed length arrays. Here is the computation of
  * that size.
  *
  * Never make SMALLEST_POSSIBLE_MALLOC smaller than sizeof(list) because we
@@ -226,7 +226,7 @@ struct mdesc {
 
   /* @brief List of all blocks containing free fragments of a given size.
    *
-   * The array indice is the log2 of requested size.
+   * The array index is the log2 of requested size.
    * Actually only the sizes 8->11 seem to be used, but who cares? */
   s_xbt_swag_t fraghead[BLOCKLOG];
 
diff --git a/src/xbt/mmalloc/mrealloc.c b/src/xbt/mmalloc/mrealloc.c
index 2d3c1ce4b2..20a0290647 100644
--- a/src/xbt/mmalloc/mrealloc.c
+++ b/src/xbt/mmalloc/mrealloc.c
@@ -43,7 +43,7 @@ void *mrealloc(xbt_mheap_t mdp, void *ptr, size_t size)
 
   size_t requested_size = size; // The amount of memory requested by user, for real
 
-  /* Work even if the user was stupid enough to ask a ridicullously small block (even 0-length),
+  /* Work even if the user was stupid enough to ask a ridiculously small block (even 0-length),
    *    ie return a valid block that can be realloced and freed.
    * glibc malloc does not use this trick but return a constant pointer, but we need to enlist the free fragments later on.
    */
diff --git a/src/xbt/mmalloc/swag.c b/src/xbt/mmalloc/swag.c
index 6453a05e42..8e07028027 100644
--- a/src/xbt/mmalloc/swag.c
+++ b/src/xbt/mmalloc/swag.c
@@ -55,7 +55,7 @@ static inline void xbt_swag_init(xbt_swag_t swag, size_t offset)
 }
 
 /*
- * @param obj the objet to insert in the swag
+ * @param obj the object to insert in the swag
  * @param swag a swag
  *
  * insert (at the tail... you probably had a very good reason to do that, I hope you know what you're doing) @a obj in
@@ -80,7 +80,7 @@ static inline void xbt_swag_insert(void *obj, xbt_swag_t swag)
 }
 
 /*
- * @param obj the objet to remove from the swag
+ * @param obj the object to remove from the swag
  * @param swag a swag
  * @return @a obj if it was in the @a swag and NULL otherwise
  *
diff --git a/teshsuite/mc/random-bug/random-bug.cpp b/teshsuite/mc/random-bug/random-bug.cpp
index 03bc2ae7df..57c291ab74 100644
--- a/teshsuite/mc/random-bug/random-bug.cpp
+++ b/teshsuite/mc/random-bug/random-bug.cpp
@@ -12,7 +12,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(random_bug, "For this example");
 
 enum { ABORT, ASSERT, PRINTF } behavior;
 
-/** A fake application with a bug occuring for some random values */
+/** A fake application with a bug occurring for some random values */
 static void app()
 {
   int x = MC_random(0, 5);
diff --git a/teshsuite/msg/app-bittorrent/bittorrent-peer.c b/teshsuite/msg/app-bittorrent/bittorrent-peer.c
index e1b6cba2d8..f959e9c4ee 100644
--- a/teshsuite/msg/app-bittorrent/bittorrent-peer.c
+++ b/teshsuite/msg/app-bittorrent/bittorrent-peer.c
@@ -586,9 +586,9 @@ void update_choked_peers(peer_t peer)
   // update the current round
   peer->round = (peer->round + 1) % 3;
   char* key;
-  char* key_choked          = NULL;
-  connection_t peer_choosed = NULL;
-  connection_t peer_choked  = NULL;
+  char* key_choked         = NULL;
+  connection_t peer_chosen = NULL;
+  connection_t peer_choked = NULL;
   // remove a peer from the list
   xbt_dict_cursor_t cursor = NULL;
   xbt_dict_cursor_first(peer->active_peers, &cursor);
@@ -607,7 +607,7 @@ void update_choked_peers(peer_t peer)
       if (connection->last_unchoke < unchoke_time && (connection->interested != 0) &&
           (connection->choked_upload != 0)) {
         unchoke_time = connection->last_unchoke;
-        peer_choosed = connection;
+        peer_chosen  = connection;
       }
     }
   } else {
@@ -624,19 +624,19 @@ void update_choked_peers(peer_t peer)
         connection_t connection;
         xbt_dict_foreach (peer->peers, cursor, key, connection) {
           if (i == id_chosen) {
-            peer_choosed = connection;
+            peer_chosen = connection;
             break;
           }
           i++;
         }
         xbt_dict_cursor_free(&cursor);
-        xbt_assert(peer_choosed != NULL, "A peer should have been selected at this point");
-        if ((peer_choosed->interested == 0) || (peer_choosed->choked_upload == 0))
-          peer_choosed = NULL;
+        xbt_assert(peer_chosen != NULL, "A peer should have been selected at this point");
+        if ((peer_chosen->interested == 0) || (peer_chosen->choked_upload == 0))
+          peer_chosen = NULL;
         else
           XBT_DEBUG("Nothing to do, keep going");
         j++;
-      } while (peer_choosed == NULL && j < MAXIMUM_PEERS);
+      } while (peer_chosen == NULL && j < MAXIMUM_PEERS);
     } else {
       // Use the "fastest download" policy.
       connection_t connection;
@@ -644,18 +644,18 @@ void update_choked_peers(peer_t peer)
       xbt_dict_foreach (peer->peers, cursor, key, connection) {
         if (connection->peer_speed > fastest_speed && (connection->choked_upload != 0) &&
             (connection->interested != 0)) {
-          peer_choosed  = connection;
+          peer_chosen   = connection;
           fastest_speed = connection->peer_speed;
         }
       }
     }
   }
 
-  if (peer_choosed != NULL)
-    XBT_DEBUG("(%d) update_choked peers unchoked (%d) ; int (%d) ; choked (%d) ", peer->id, peer_choosed->id,
-              peer_choosed->interested, peer_choosed->choked_upload);
+  if (peer_chosen != NULL)
+    XBT_DEBUG("(%d) update_choked peers unchoked (%d) ; int (%d) ; choked (%d) ", peer->id, peer_chosen->id,
+              peer_chosen->interested, peer_chosen->choked_upload);
 
-  if (peer_choked != peer_choosed) {
+  if (peer_choked != peer_chosen) {
     if (peer_choked != NULL) {
       xbt_assert((!peer_choked->choked_upload), "Tries to choked a choked peer");
       peer_choked->choked_upload = 1;
@@ -664,14 +664,14 @@ void update_choked_peers(peer_t peer)
       XBT_DEBUG("(%d) Sending a CHOKE to %d", peer->id, peer_choked->id);
       send_choked(peer, peer_choked->mailbox);
     }
-    if (peer_choosed != NULL) {
-      xbt_assert((peer_choosed->choked_upload), "Tries to unchoked an unchoked peer");
-      peer_choosed->choked_upload = 0;
-      xbt_dict_set_ext(peer->active_peers, (char*)&peer_choosed->id, sizeof(int), peer_choosed, NULL);
-      peer_choosed->last_unchoke = MSG_get_clock();
-      XBT_DEBUG("(%d) Sending a UNCHOKE to %d", peer->id, peer_choosed->id);
-      update_active_peers_set(peer, peer_choosed);
-      send_unchoked(peer, peer_choosed->mailbox);
+    if (peer_chosen != NULL) {
+      xbt_assert((peer_chosen->choked_upload), "Tries to unchoked an unchoked peer");
+      peer_chosen->choked_upload = 0;
+      xbt_dict_set_ext(peer->active_peers, (char*)&peer_chosen->id, sizeof(int), peer_chosen, NULL);
+      peer_chosen->last_unchoke = MSG_get_clock();
+      XBT_DEBUG("(%d) Sending a UNCHOKE to %d", peer->id, peer_chosen->id);
+      update_active_peers_set(peer, peer_chosen);
+      send_unchoked(peer, peer_chosen->mailbox);
     }
   }
 }
diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes.cpp b/teshsuite/msg/host_on_off_processes/host_on_off_processes.cpp
index 8f278b2fdf..5c52339d82 100644
--- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.cpp
+++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.cpp
@@ -108,7 +108,7 @@ static int test_launcher(int /*argc*/, char** /*argv*/)
   }
 
   test = 3;
-  // Create a process running sucessive sleeps on a host and turn the host off during the execution of the process.
+  // Create a process running successive sleeps on a host and turn the host off during the execution of the process.
   if (xbt_dynar_search_or_negative(tests, &test) != -1) {
     xbt_die("Test 3 is superseeded by activity-lifecycle");
   }
diff --git a/teshsuite/msg/io-file-remote/io-file-remote.c b/teshsuite/msg/io-file-remote/io-file-remote.c
index b62bfb7fa2..3d6cf510ae 100644
--- a/teshsuite/msg/io-file-remote/io-file-remote.c
+++ b/teshsuite/msg/io-file-remote/io-file-remote.c
@@ -22,7 +22,7 @@ static int host(int argc, char* argv[])
   XBT_INFO("Try to read %llu from '%s'", MSG_file_get_size(file), filename);
   sg_size_t read = MSG_file_read(file, MSG_file_get_size(file));
   XBT_INFO("Have read %llu from '%s'. Offset is now at: %llu", read, filename, MSG_file_tell(file));
-  XBT_INFO("Seek back to the begining of the stream...");
+  XBT_INFO("Seek back to the beginning of the stream...");
   MSG_file_seek(file, 0, SEEK_SET);
   XBT_INFO("Offset is now at: %llu", MSG_file_tell(file));
 
diff --git a/teshsuite/msg/io-file-remote/io-file-remote.tesh b/teshsuite/msg/io-file-remote/io-file-remote.tesh
index a3127a0589..30c9a47145 100644
--- a/teshsuite/msg/io-file-remote/io-file-remote.tesh
+++ b/teshsuite/msg/io-file-remote/io-file-remote.tesh
@@ -40,18 +40,18 @@ $ ${bindir:=.}/io-file-remote ${platfdir:=.}/storage/remote_io.xml ${srcdir:=.}/
 > 		File Descriptor Id: 0
 > [  0.000000] (4@ dave) Try to read 48868 from '/tmp/doc/simgrid/examples/simdag/dax/Montage_50.xml'
 > [  0.001062] (4@ dave) Have read 48868 from '/tmp/doc/simgrid/examples/simdag/dax/Montage_50.xml'. Offset is now at: 48868
-> [  0.001062] (4@ dave) Seek back to the begining of the stream...
+> [  0.001062] (4@ dave) Seek back to the beginning of the stream...
 > [  0.001062] (4@ dave) Offset is now at: 0
 > [  0.001062] (4@ dave) Opened file '/tmp/doc/simgrid/examples/simdag/scheduling/Montage_25.xml'
 > [  0.001062] (4@ dave) Try to write 22 MiB to '/tmp/doc/simgrid/examples/simdag/scheduling/Montage_25.xml'
 > [  0.050039] (1@alice) Have read 1624671 from '/tmp/doc/simgrid/examples/msg/chord/chord10k.xml'. Offset is now at: 1624671
-> [  0.050039] (1@alice) Seek back to the begining of the stream...
+> [  0.050039] (1@alice) Seek back to the beginning of the stream...
 > [  0.050039] (1@alice) Offset is now at: 0
 > [  0.276315] (3@ carl) Have read 12710497 from '/scratch/lib/libsimgrid.so.3.6.2'. Offset is now at: 12710497
-> [  0.276315] (3@ carl) Seek back to the begining of the stream...
+> [  0.276315] (3@ carl) Seek back to the beginning of the stream...
 > [  0.276315] (3@ carl) Offset is now at: 0
 > [  0.387036] (2@  bob) Have read 12710497 from '/scratch/lib/libsimgrid.so.3.6.2'. Offset is now at: 12710497
-> [  0.387036] (2@  bob) Seek back to the begining of the stream...
+> [  0.387036] (2@  bob) Seek back to the beginning of the stream...
 > [  0.387036] (2@  bob) Offset is now at: 0
 > [  0.387036] (2@  bob) Opened file '/scratch/doc/simgrid/examples/platforms/g5k.xml'
 > [  0.387036] (2@  bob) Try to write 16 MiB to '/scratch/doc/simgrid/examples/platforms/g5k.xml'
diff --git a/teshsuite/msg/platform-properties/platform-properties.c b/teshsuite/msg/platform-properties/platform-properties.c
index e861d58c02..3838b0635a 100644
--- a/teshsuite/msg/platform-properties/platform-properties.c
+++ b/teshsuite/msg/platform-properties/platform-properties.c
@@ -91,7 +91,7 @@ static int bob(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED char* argv[])
   XBT_INFO("== Try to get a process property that does not exist");
 
   value = MSG_process_get_property_value(MSG_process_self(), noexist);
-  xbt_assert(!value, "The property is defined (it shouldnt)");
+  xbt_assert(!value, "The property is defined (it shouldn't)");
   xbt_dict_free(&props);
 
   return 0;
diff --git a/teshsuite/s4u/listen_async/listen_async.cpp b/teshsuite/s4u/listen_async/listen_async.cpp
index 20172e5548..1e64d69f18 100644
--- a/teshsuite/s4u/listen_async/listen_async.cpp
+++ b/teshsuite/s4u/listen_async/listen_async.cpp
@@ -6,7 +6,7 @@
 /* Bug report: https://github.com/simgrid/simgrid/issues/40
  *
  * Task.listen used to be on async mailboxes as it always returned false.
- * This occures in Java and C, but is only tested here in C.
+ * This occurs in Java and C, but is only tested here in C.
  */
 
 #include "simgrid/s4u.hpp"
diff --git a/teshsuite/simdag/platforms/bogus_disk_attachment.xml b/teshsuite/simdag/platforms/bogus_disk_attachment.xml
index 411dedfe6b..e61b30bc06 100644
--- a/teshsuite/simdag/platforms/bogus_disk_attachment.xml
+++ b/teshsuite/simdag/platforms/bogus_disk_attachment.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE platform SYSTEM "https://simgrid.org/simgrid.dtd">
 <platform version="4.1">
   <!-- THIS FILE IS INVALID.
-       It declares a storage attached to a nonexistant host (plouf). See bogus_disk_attachment.tesh -->
+       It declares a storage attached to a nonexistent host (plouf). See bogus_disk_attachment.tesh -->
   <zone id="AS0" routing="Full">
     <storage_type id="single_HDD" model="SSD" size="4kB">
       <model_prop id="Bwrite" value="30MBps" />
diff --git a/teshsuite/simix/generic-simcalls/generic-simcalls.cpp b/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
index 718741bc0a..71cb9cbf6b 100644
--- a/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
+++ b/teshsuite/simix/generic-simcalls/generic-simcalls.cpp
@@ -60,7 +60,7 @@ static void master()
     XBT_INFO("Exception caught: %s", e.what());
   }
 
-  // Synchronize on a successul Future<int> and get the value:
+  // Synchronize on a successful Future<int> and get the value:
   int res = simgrid::simix::kernel_sync([] {
     return kernel_wait_until(30).then([](simgrid::kernel::Future<void> f) {
       f.get();
@@ -70,7 +70,7 @@ static void master()
   });
   XBT_INFO("kernel_sync with value returned with %i", res);
 
-  // Synchronize on a successul Future<int> and get the value:
+  // Synchronize on a successful Future<int> and get the value:
   simgrid::simix::Future<int> future = simgrid::simix::kernel_async([] {
     return kernel_wait_until(50).then([](simgrid::kernel::Future<void> f) {
       f.get();
@@ -81,7 +81,7 @@ static void master()
   res = future.get();
   XBT_INFO("kernel_async with value returned with %i", res);
 
-  // Synchronize on a successul Future<int> and get the value:
+  // Synchronize on a successful Future<int> and get the value:
   future = simgrid::simix::kernel_async([] {
     return kernel_wait_until(60).then([](simgrid::kernel::Future<void> f) {
       f.get();
diff --git a/teshsuite/smpi/type-hvector/type-hvector.c b/teshsuite/smpi/type-hvector/type-hvector.c
index 30b6ea82ca..29b3492868 100644
--- a/teshsuite/smpi/type-hvector/type-hvector.c
+++ b/teshsuite/smpi/type-hvector/type-hvector.c
@@ -26,7 +26,7 @@ int main(int argc, char **argv) {
           a[i][j] = i * SIZE + j;
     }
 
-    /* only one column is send this is an exemple for non-contignous data*/
+    /* only one column is sent this is an example for non-contiguous data*/
     MPI_Bcast(a, 1, columntype, 0, MPI_COMM_WORLD);
 
     for (int i = 0; i < SIZE; i++) {
diff --git a/teshsuite/smpi/type-vector/type-vector.c b/teshsuite/smpi/type-vector/type-vector.c
index 6b69858e17..75880209e2 100644
--- a/teshsuite/smpi/type-vector/type-vector.c
+++ b/teshsuite/smpi/type-vector/type-vector.c
@@ -26,7 +26,7 @@ int main(int argc, char **argv) {
           a[i][j] = i*SIZE+j;
     }
 
-    /* only one column is send this is an exemple for non-contignous data*/
+    /* only one column is sent this is an example for non-contiguous data*/
     MPI_Bcast(a, 1, columntype, 0, MPI_COMM_WORLD);
 
     for (int i = 0; i < SIZE; i++) {
diff --git a/tools/MSG_visualization/trace2fig.pl b/tools/MSG_visualization/trace2fig.pl
index 1e8e9eef27..668cb5eac0 100755
--- a/tools/MSG_visualization/trace2fig.pl
+++ b/tools/MSG_visualization/trace2fig.pl
@@ -98,16 +98,16 @@ sub read_link {
 
 sub build_cat_tree {
     my($root,$Cat)=@_;
-    my(@childs)=();
+    my(@children)=();
     my($cat);
 
     foreach $cat (keys %$Cat) {
 	if($$Cat{$cat}{father} eq $root) {
-	    push @childs, build_cat_tree($cat,$Cat);
+	    push @children, build_cat_tree($cat,$Cat);
 	}
 #	print "$$Cat{$cat}{name}\t\t $Cat{$cat}{father}\n";
     }
-    return [$root,@childs];
+    return [$root,@children];
 }
 
 sub build_cat_list {
diff --git a/tools/cmake/Distrib.cmake b/tools/cmake/Distrib.cmake
index 4948b39853..3aec81c9fd 100644
--- a/tools/cmake/Distrib.cmake
+++ b/tools/cmake/Distrib.cmake
@@ -135,7 +135,7 @@ endif()
 
 ################################################################
 ## Build a sain "make dist" target to build a source package ###
-##   containing only the files that I explicitely state      ###
+##    containing only the files that I explicitly state      ###
 ##   (instead of any cruft laying on my disk as CPack does)  ###
 ################################################################
 
diff --git a/tools/cmake/Modules/FindPAPI.cmake b/tools/cmake/Modules/FindPAPI.cmake
index e283f428cb..8427cfed56 100644
--- a/tools/cmake/Modules/FindPAPI.cmake
+++ b/tools/cmake/Modules/FindPAPI.cmake
@@ -4,7 +4,7 @@
 #
 #     find_package(PAPI)
 #
-# Variables used by this module, they can change the default behaviour and need
+# Variables used by this module, they can change the default behavior and need
 # to be set before calling find_package:
 #
 #  PAPI_PREFIX         Set this variable to the root installation of
diff --git a/tools/internal/spell_dict.txt b/tools/internal/spell_dict.txt
index bbab9e30a0..219270f757 100644
--- a/tools/internal/spell_dict.txt
+++ b/tools/internal/spell_dict.txt
@@ -9,6 +9,8 @@ atof
 callgrind
 calloc
 cfg
+CMake
+cmake
 comm
 const
 cplusplus
@@ -63,8 +65,10 @@ mmap
 ModelChecker
 modelchecker
 MPI
+MPICH
 msg
 mutex
+NetZone
 nullptr
 ok
 Paje
@@ -88,10 +92,16 @@ sizeof
 SMPI
 smpi
 smx
+snprintf
 src
+StarPU
 std
+stdint
+stderr
+stdout
 strerror
 strlen
+strtok
 struct
 syscall
 syscalls
@@ -100,6 +110,7 @@ testany
 todo
 TODO
 valgrind
+vasprintf
 VM
 VMs
 waitany
-- 
2.20.1