-fix many more typos

27 files changed, 62 insertions, 62 deletions

diff --git a/src/testbed/generate-underlay-topology.c b/src/testbed/generate-underlay-topology.c
index 97c3c1e67..b7bd8fce9 100644
--- a/src/testbed/generate-underlay-topology.c
+++ b/src/testbed/generate-underlay-topology.c
@@ -306,7 +306,7 @@ run (void *cls,
   default:
     break;
   }
-  /* contruct topologies */
+  /* construct topologies */
   switch (topology)
   {
   case GNUNET_TESTBED_TOPOLOGY_LINE:
@@ -393,7 +393,7 @@ main (int argc, char *const argv[])
       "\t cap: the maximum number of links a node can have\n"
       "\t m: the number of links a node should have while joining the network\n"
       "\t filename: the path of the file which contains topology information\n"
-      "NOTE: the format of the above file is descibed here: https://www.gnunet.org/content/topology-file-format\n"),
+      "NOTE: the format of the above file is described here: https://www.gnunet.org/content/topology-file-format\n"),
     option,
     &run,
     NULL);
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index 5d0c3b048..938e50448 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -395,7 +395,7 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message)
 
     GNUNET_asprintf (&evar, GNUNET_TESTING_PREFIX "=%s", evstr);
     GNUNET_assert (0 == putenv (evar)); /* consumes 'evar',
-                                           see putenv(): becomes part of envrionment! */
+                                           see putenv(): becomes part of environment! */
     GNUNET_free (evstr);
     evstr = NULL;
   }
@@ -426,7 +426,7 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message)
     /* expose testbed configuration through env variable */
     GNUNET_asprintf (&evar, "%s=%s", ENV_TESTBED_CONFIG, config);
     GNUNET_assert (0 == putenv (evar));   /* consumes 'evar',
-                                            see putenv(): becomes part of envrionment! */
+                                            see putenv(): becomes part of environment! */
     evstr = NULL;
   }
   testbed = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR /*verbose? */,
diff --git a/src/testbed/gnunet-service-test-barriers.c b/src/testbed/gnunet-service-test-barriers.c
index c6c42cd1f..e10a28902 100644
--- a/src/testbed/gnunet-service-test-barriers.c
+++ b/src/testbed/gnunet-service-test-barriers.c
@@ -66,7 +66,7 @@ do_shutdown (void *cls)
 
 
 /**
- * Functions of this type are to be given as acallback argumetn to
+ * Functions of this type are to be given as acallback argument to
  * GNUNET_TESTBED_barrier_wait().  The callback will be called when the barrier
  * corresponding given in GNUNET_TESTBED_barrier_wait() is crossed or cancelled.
  *
diff --git a/src/testbed/gnunet-service-testbed_barriers.c b/src/testbed/gnunet-service-testbed_barriers.c
index ac89abc88..be33bd131 100644
--- a/src/testbed/gnunet-service-testbed_barriers.c
+++ b/src/testbed/gnunet-service-testbed_barriers.c
@@ -458,7 +458,7 @@ disconnect_cb (void *cls,
 
 
 /**
- * Function to initialise barrriers component
+ * Function to initialise barriers component
  *
  * @param cfg the configuration to use for initialisation
  */
@@ -538,7 +538,7 @@ GST_barriers_destroy ()
  * @param status status of the barrier; #GNUNET_OK if the barrier is crossed;
  *   #GNUNET_SYSERR upon error
  * @param emsg if the status were to be #GNUNET_SYSERR, this parameter has the
- *   error messsage
+ *   error message
  */
 static void
 wbarrier_status_cb (void *cls,
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c
index 440f2c24f..5b9528ba3 100644
--- a/src/testbed/gnunet-service-testbed_cpustatus.c
+++ b/src/testbed/gnunet-service-testbed_cpustatus.c
@@ -78,7 +78,7 @@ static double agedIOLoad = -1;
 
 
 /**
- * hanlde to the file to write the load statistics to
+ * handle to the file to write the load statistics to
  */
 struct GNUNET_BIO_WriteHandle *bw;
 
diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c
index dbdeed0d9..fe87d64ea 100644
--- a/src/testbed/gnunet-service-testbed_links.c
+++ b/src/testbed/gnunet-service-testbed_links.c
@@ -58,7 +58,7 @@ enum LCFContextState
   DELEGATED_HOST_REGISTERED,
 
   /**
-   * The slave host has been registred at the forwarding controller
+   * The slave host has been registered at the forwarding controller
    */
   SLAVE_HOST_REGISTERED,
 
@@ -539,7 +539,7 @@ GST_find_dest_route (uint32_t host_id)
 
 
 /**
- * Function to send a failure reponse for controller link operation
+ * Function to send a failure response for controller link operation
  *
  * @param client the client to send the message to
  * @param operation_id the operation ID of the controller link request
@@ -794,12 +794,12 @@ slave_event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
 
 
 /**
- * Callback to signal successfull startup of the controller process
+ * Callback to signal successful startup of the controller process
  *
  * @param cls the handle to the slave whose status is to be found here
  * @param cfg the configuration with which the controller has been started;
  *          NULL if status is not #GNUNET_OK
- * @param status #GNUNET_OK if the startup is successfull; #GNUNET_SYSERR if not,
+ * @param status #GNUNET_OK if the startup is successful; #GNUNET_SYSERR if not,
  *          GNUNET_TESTBED_controller_stop() shouldn't be called in this case
  */
 static void
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 8a61f72f7..4fe7c20b3 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -392,7 +392,7 @@ forwarded_overlay_connect_timeout (void *cls)
 
 /**
  * Callback to be called when forwarded overlay connection operation has a reply
- * from the sub-controller successfull. We have to relay the reply msg back to
+ * from the sub-controller successful. We have to relay the reply msg back to
  * the client
  *
  * @param cls ForwardedOperationContext
@@ -578,7 +578,7 @@ cleanup_occ (struct OverlayConnectContext *occ)
 
 
 /**
- * Task for cleaing up overlay connect context structure
+ * Task for cleaning up overlay connect context structure
  *
  * @param cls the overlay connect context
  */
@@ -1222,7 +1222,7 @@ occ_cache_get_handle_core_cb (void *cls,
 
 /**
  * Callback to be called when forwarded get peer config operation as part of
- * overlay connect is successfull. Connection to Peer 1's core is made and is
+ * overlay connect is successful. Connection to Peer 1's core is made and is
  * checked for new connection from peer 2
  *
  * @param cls ForwardedOperationContext
@@ -1369,7 +1369,7 @@ register_host (struct Slave *slave,
                                                    reghost_match_iterator,
                                                    &rhc)))
   {
-    /* create and add a new registerd host context */
+    /* create and add a new registered host context */
     /* add the focc to its queue */
     GNUNET_CONTAINER_multihashmap_put (slave->reghost_map,
                                        &hash,
diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c
index 0184635fa..0bfeb4583 100644
--- a/src/testbed/gnunet-service-testbed_peers.c
+++ b/src/testbed/gnunet-service-testbed_peers.c
@@ -227,7 +227,7 @@ peer_create_forward_timeout (void *cls)
 
 
 /**
- * Callback to be called when forwarded peer create operation is successfull. We
+ * Callback to be called when forwarded peer create operation is successful. We
  * have to relay the reply msg back to the client
  *
  * @param cls ForwardedOperationContext
@@ -387,7 +387,7 @@ GST_notify_client_disconnect_peers (struct GNUNET_SERVICE_Client *client)
 
 
 /**
- * Callback to be called when forwarded peer destroy operation is successfull. We
+ * Callback to be called when forwarded peer destroy operation is successful. We
  * have to relay the reply msg back to the client
  *
  * @param cls ForwardedOperationContext
@@ -576,7 +576,7 @@ handle_peer_destroy (void *cls,
   uint32_t peer_id;
 
   peer_id = ntohl (msg->peer_id);
-  LOG_DEBUG ("Received peer destory on peer: %u and operation id: %llu\n",
+  LOG_DEBUG ("Received peer destroy on peer: %u and operation id: %llu\n",
              (unsigned int) peer_id,
              (unsigned long long) GNUNET_ntohll (msg->operation_id));
   if (! VALID_PEER_ID (peer_id))
@@ -592,7 +592,7 @@ handle_peer_destroy (void *cls,
   peer = GST_peer_list[peer_id];
   if (GNUNET_YES == peer->is_remote)
   {
-    /* Forward the destory message to sub controller */
+    /* Forward the destroy message to sub controller */
     fopc = GNUNET_new (struct ForwardedOperationContext);
     fopc->client = client;
     fopc->cls = peer;
@@ -986,7 +986,7 @@ check_peer_reconfigure (void *cls,
 
 /**
  * Handler for #GNUNET_MESSAGE_TYPDE_TESTBED_RECONFIGURE_PEER type messages.
- * Should stop the peer asyncronously, destroy it and create it again with the
+ * Should stop the peer asynchronously, destroy it and create it again with the
  * new configuration.
  *
  * @param cls identification of the client
@@ -1342,7 +1342,7 @@ handle_manage_peer_service (void *cls,
   }
   if (GNUNET_YES == peer->is_remote)
   {
-    /* Forward the destory message to sub controller */
+    /* Forward the destroy message to sub controller */
     fopc = GNUNET_new (struct ForwardedOperationContext);
     fopc->client = client;
     fopc->cls = peer;
diff --git a/src/testbed/gnunet-testbed-profiler.c b/src/testbed/gnunet-testbed-profiler.c
index 90813c8e5..b07c725a3 100644
--- a/src/testbed/gnunet-testbed-profiler.c
+++ b/src/testbed/gnunet-testbed-profiler.c
@@ -287,7 +287,7 @@ main (int argc, char *const *argv)
                                "num-errors",
                                "COUNT",
                                gettext_noop (
-                                 "tolerate COUNT number of continious timeout failures"),
+                                 "tolerate COUNT number of continuous timeout failures"),
                                &num_cont_fails),
     GNUNET_GETOPT_option_flag ('n',
                                "non-interactive",
diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c
index d4eec0269..ea303a86c 100644
--- a/src/testbed/test_gnunet_helper_testbed.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -66,7 +66,7 @@ static struct GNUNET_SCHEDULER_Task *abort_task;
 static struct GNUNET_SCHEDULER_Task *shutdown_task;
 
 /**
- * Configuratin handler
+ * Configuration handle.
  */
 static struct GNUNET_CONFIGURATION_Handle *cfg;
 
@@ -178,7 +178,7 @@ mst_cb (void *cls,
 
 /**
  * Callback that will be called when the helper process dies. This is not called
- * when the helper process is stoped using GNUNET_HELPER_stop()
+ * when the helper process is stopped using GNUNET_HELPER_stop()
  *
  * @param cls the closure from GNUNET_HELPER_start()
  */
diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index 49f1d9ae9..a46a7596a 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -269,7 +269,7 @@ service_connect_comp_cb (void *cls,
  * @param op the operation this callback corresponds to
  * @param pinfo the result; will be NULL if the operation has failed
  * @param emsg error message if the operation has failed; will be NULL if the
- *          operation is successfull
+ *          operation is successful
  */
 static void
 peerinfo_cb (void *cb_cls,
@@ -420,12 +420,12 @@ registration_comp (void *cls,
 
 
 /**
- * Callback to signal successfull startup of the controller process
+ * Callback to signal successful startup of the controller process
  *
  * @param cls the closure from GNUNET_TESTBED_controller_start()
  * @param cfg the configuration with which the controller has been started;
  *          NULL if status is not #GNUNET_OK
- * @param status #GNUNET_OK if the startup is successfull; #GNUNET_SYSERR if not,
+ * @param status #GNUNET_OK if the startup is successful; #GNUNET_SYSERR if not,
  *          GNUNET_TESTBED_controller_stop() shouldn't be called in this case
  */
 static void
diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c
index 4a8b8a584..1ca1d1b2e 100644
--- a/src/testbed/test_testbed_api_2peers_1controller.c
+++ b/src/testbed/test_testbed_api_2peers_1controller.c
@@ -450,12 +450,12 @@ registration_comp (void *cls, const char *emsg)
 
 
 /**
- * Callback to signal successfull startup of the controller process
+ * Callback to signal successful startup of the controller process
  *
  * @param cls the closure from GNUNET_TESTBED_controller_start()
  * @param cfg the configuration with which the controller has been started;
  *          NULL if status is not GNUNET_OK
- * @param status GNUNET_OK if the startup is successfull; GNUNET_SYSERR if not,
+ * @param status GNUNET_OK if the startup is successful; GNUNET_SYSERR if not,
  *          GNUNET_TESTBED_controller_stop() shouldn't be called in this case
  */
 static void
diff --git a/src/testbed/test_testbed_api_3peers_3controllers.c b/src/testbed/test_testbed_api_3peers_3controllers.c
index bf9011941..17072ffa8 100644
--- a/src/testbed/test_testbed_api_3peers_3controllers.c
+++ b/src/testbed/test_testbed_api_3peers_3controllers.c
@@ -787,12 +787,12 @@ registration_comp (void *cls, const char *emsg)
 
 
 /**
- * Callback to signal successfull startup of the controller process
+ * Callback to signal successful startup of the controller process
  *
  * @param cls the closure from GNUNET_TESTBED_controller_start()
  * @param cfg the configuration with which the controller has been started;
  *          NULL if status is not GNUNET_OK
- * @param status GNUNET_OK if the startup is successfull; GNUNET_SYSERR if not,
+ * @param status GNUNET_OK if the startup is successful; GNUNET_SYSERR if not,
  *          GNUNET_TESTBED_controller_stop() shouldn't be called in this case
  */
 static void
diff --git a/src/testbed/test_testbed_api_barriers.c b/src/testbed/test_testbed_api_barriers.c
index f80e73ddd..74dd89126 100644
--- a/src/testbed/test_testbed_api_barriers.c
+++ b/src/testbed/test_testbed_api_barriers.c
@@ -98,7 +98,7 @@ do_timeout (void *cls)
  * @param status status of the barrier; #GNUNET_OK if the barrier is crossed;
  *   #GNUNET_SYSERR upon error
  * @param emsg if the status were to be #GNUNET_SYSERR, this parameter has the
- *   error messsage
+ *   error message
  */
 static void
 barrier_cb (void *cls,
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index 784407520..0ec9d63e1 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -163,7 +163,7 @@ enum Stage
   SLAVE1_PEER_DESTROY_SUCCESS,
 
   /**
-   * Peer destory on slave 2 successful
+   * Peer destroy on slave 2 successful
    */
   SLAVE2_PEER_DESTROY_SUCCESS,
 
@@ -178,7 +178,7 @@ enum Stage
   SLAVE3_LINK_SUCCESS,
 
   /**
-   * Master peer destoryed.  Destory slave 3 peer
+   * Master peer destroyed.  Destroy slave 3 peer
    */
   MASTER_PEER_DESTROY_SUCCESS,
 
@@ -478,7 +478,7 @@ peer_create_cb (void *cls, struct GNUNET_TESTBED_Peer *peer, const char *emsg)
 
 /**
  * Checks the event if it is an operation finished event and if indicates a
- * successfull completion of operation
+ * successful completion of operation
  *
  * @param event the event information to check
  */
@@ -727,12 +727,12 @@ registration_cont (void *cls, const char *emsg)
 
 
 /**
- * Callback to signal successfull startup of the controller process
+ * Callback to signal successful startup of the controller process
  *
  * @param cls the closure from GNUNET_TESTBED_controller_start()
  * @param cfg the configuration with which the controller has been started;
  *          NULL if status is not GNUNET_OK
- * @param status GNUNET_OK if the startup is successfull; GNUNET_SYSERR if not,
+ * @param status GNUNET_OK if the startup is successful; GNUNET_SYSERR if not,
  *          GNUNET_TESTBED_controller_stop() shouldn't be called in this case
  */
 static void
diff --git a/src/testbed/test_testbed_api_operations.c b/src/testbed/test_testbed_api_operations.c
index aed213d49..133aadf21 100644
--- a/src/testbed/test_testbed_api_operations.c
+++ b/src/testbed/test_testbed_api_operations.c
@@ -105,7 +105,7 @@ struct GNUNET_TESTBED_Operation *op7;
 struct GNUNET_TESTBED_Operation *op8;
 
 /**
- * This opration is started after activating op8.  It should consume a resource
+ * This operation is started after activating op8.  It should consume a resource
  * on queues q1 and q2.  It should not be started until op8 is again made
  * inactive at which point it should be released.  It can be released as soon as
  * it begins.
@@ -250,7 +250,7 @@ start_cb (void *cls);
  * be because of a call to "GNUNET_TESTBED_operation_cancel" (before the
  * operation generated an event) or AFTER the operation generated an event due
  * to a call to "GNUNET_TESTBED_operation_done".  Thus it is not guaranteed that
- * a callback to the 'OperationStart' preceeds the call to 'OperationRelease'.
+ * a callback to the 'OperationStart' precedes the call to 'OperationRelease'.
  * Implementations of this function are expected to clean up whatever state is
  * in 'cls' and release all resources associated with the operation.
  */
@@ -419,7 +419,7 @@ start_cb (void *cls)
  * be because of a call to "GNUNET_TESTBED_operation_cancel" (before the
  * operation generated an event) or AFTER the operation generated an event due
  * to a call to "GNUNET_TESTBED_operation_done".  Thus it is not guaranteed that
- * a callback to the 'OperationStart' preceeds the call to 'OperationRelease'.
+ * a callback to the 'OperationStart' precedes the call to 'OperationRelease'.
  * Implementations of this function are expected to clean up whatever state is
  * in 'cls' and release all resources associated with the operation.
  */
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c
index aefbd340e..f451c6555 100644
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -122,7 +122,7 @@ do_abort (void *cls)
  * @param op the operation this callback corresponds to
  * @param pinfo the result; will be NULL if the operation has failed
  * @param emsg error message if the operation has failed; will be NULL if the
- *          operation is successfull
+ *          operation is successful
  */
 static void
 peerinfo_cb (void *cb_cls, struct GNUNET_TESTBED_Operation *op_,
diff --git a/src/testbed/test_testbed_api_test_timeout.c b/src/testbed/test_testbed_api_test_timeout.c
index d2f73df14..fe76ad441 100644
--- a/src/testbed/test_testbed_api_test_timeout.c
+++ b/src/testbed/test_testbed_api_test_timeout.c
@@ -20,7 +20,7 @@
 
 /**
  * @file src/testbed/test_testbed_api_test.c
- * @brief testing cases for testing notications via test master callback upon
+ * @brief testing cases for testing notifications via test master callback upon
  *          timeout while setting up testbed using functions
  *          GNUNET_TESTBED_test_run()
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 386850b89..18bb0c3f6 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -239,7 +239,7 @@ struct SearchContext
 /**
  * Search iterator for searching an operation context
  *
- * @param cls the serach context
+ * @param cls the search context
  * @param key current key code
  * @param value value in the hash map
  * @return #GNUNET_YES if we should continue to iterate,
@@ -408,7 +408,7 @@ handle_add_host_confirm (void *cls,
  * Handler for forwarded operations
  *
  * @param c the controller handle
- * @param opc the opearation context
+ * @param opc the operation context
  * @param msg the message
  */
 static void
diff --git a/src/testbed/testbed_api_cmd_controller.c b/src/testbed/testbed_api_cmd_controller.c
index da23df1ef..e3044eaa7 100644
--- a/src/testbed/testbed_api_cmd_controller.c
+++ b/src/testbed/testbed_api_cmd_controller.c
@@ -126,12 +126,12 @@ registration_comp (void *cls,
 
 
 /**
- * Callback to signal successfull startup of the controller process
+ * Callback to signal successful startup of the controller process
  *
  * @param cls the closure from GNUNET_TESTBED_controller_start()
  * @param cfg the configuration with which the controller has been started;
  *          NULL if status is not #GNUNET_OK
- * @param status #GNUNET_OK if the startup is successfull; #GNUNET_SYSERR if not,
+ * @param status #GNUNET_OK if the startup is successful; #GNUNET_SYSERR if not,
  *          GNUNET_TESTBED_controller_stop() shouldn't be called in this case
  */
 static void
diff --git a/src/testbed/testbed_api_cmd_tng_service.c b/src/testbed/testbed_api_cmd_tng_service.c
index f9ef44bad..cce2e14e3 100644
--- a/src/testbed/testbed_api_cmd_tng_service.c
+++ b/src/testbed/testbed_api_cmd_tng_service.c
@@ -177,7 +177,7 @@ service_connect_comp_cb (void *cls,
   if (NULL != emsg)
   {
     LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "An error occured connecting to service %s\n",
+         "An error occurred connecting to service %s\n",
          emsg);
     GNUNET_TESTBED_operation_done (ts->operation);
   }
@@ -191,7 +191,7 @@ service_connect_comp_cb (void *cls,
  * @param op the operation this callback corresponds to
  * @param pinfo the result; will be NULL if the operation has failed
  * @param emsg error message if the operation has failed;
- *             NULL if the operation is successfull
+ *             NULL if the operation is successful
  */
 static void
 pi_cb (void *cls,
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 95a6bf76f..26d2553e0 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -1044,7 +1044,7 @@ clear_msg (void *cls, int result)
 
 /**
  * Callback that will be called when the helper process dies. This is not called
- * when the helper process is stoped using GNUNET_HELPER_stop()
+ * when the helper process is stopped using GNUNET_HELPER_stop()
  *
  * @param cls the closure from GNUNET_HELPER_start()
  */
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index ae85e0842..a23f8c666 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -36,7 +36,7 @@
 #define ADAPTIVE_QUEUE_DEFAULT_HISTORY 40
 
 /**
- * The number of parallel opeartions we start with by default for adaptive
+ * The number of parallel operations we start with by default for adaptive
  * queues
  */
 #define ADAPTIVE_QUEUE_DEFAULT_MAX_ACTIVE 4
@@ -213,7 +213,7 @@ struct OperationQueue
   struct FeedbackCtx *fctx;
 
   /**
-   * The type of this opeartion queue
+   * The type of this operation queue
    */
   enum OperationQueueType type;
 
@@ -232,7 +232,7 @@ struct OperationQueue
 
   /**
    * The number of resources occupied by failed operations in the current shot.
-   * This is only relavant if the operation queue is of type
+   * This is only relevant if the operation queue is of type
    * #OPERATION_QUEUE_TYPE_ADAPTIVE
    */
   unsigned int overload;
@@ -1272,7 +1272,7 @@ GNUNET_TESTBED_operation_inactivate_ (struct GNUNET_TESTBED_Operation *op)
 
 
 /**
- * Marks and inactive operation as active.  This fuction should be called to
+ * Marks and inactive operation as active.  This function should be called to
  * ensure that the oprelease callback will not be called until it is either
  * marked as inactive or released.
  *
diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c
index 7fe47d2a0..e800baa73 100644
--- a/src/testbed/testbed_api_statistics.c
+++ b/src/testbed/testbed_api_statistics.c
@@ -145,7 +145,7 @@ static struct OperationQueue *no_wait_queue;
 /**
  * Call statistics operation completion.  We call it in a separate task because
  * the iteration_completion_cb() cannot destroy statistics handle which will be
- * the case if the user calles GNUNET_TESTBED_operation_done() on the
+ * the case if the user calls GNUNET_TESTBED_operation_done() on the
  * get_statistics operation.
  *
  * @param cls the GetStatsContext
diff --git a/src/testbed/testbed_api_test.c b/src/testbed/testbed_api_test.c
index dd43cf2f6..d9eb384ba 100644
--- a/src/testbed/testbed_api_test.c
+++ b/src/testbed/testbed_api_test.c
@@ -98,7 +98,7 @@ run (void *cls, char *const *args, const char *cfgfile,
  * the program is stopped without 'master' ever being run.
  *
  * NOTE: this function should be called from 'main', NOT from
- * within a GNUNET_SCHEDULER-loop.  This function will initialze
+ * within a GNUNET_SCHEDULER-loop.  This function will initialize
  * the scheduler loop, the testbed and then pass control to
  * 'master'.
  *
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 1aa344e99..e9b9979ce 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -135,7 +135,7 @@ enum State
 
 
 /**
- * Context for host compability checks
+ * Context for host compatibility checks
  */
 struct CompatibilityCheckContext
 {
@@ -145,7 +145,7 @@ struct CompatibilityCheckContext
   struct GNUNET_TESTBED_RunHandle *rc;
 
   /**
-   * Handle for the compability check
+   * Handle for the compatibility check
    */
   struct GNUNET_TESTBED_HostHabitableCheckHandle *h;
 
@@ -307,7 +307,7 @@ struct GNUNET_TESTBED_RunHandle
   unsigned int num_peers;
 
   /**
-   * Expected overlay connects. Should be zero if no topology is relavant
+   * Expected overlay connects. Should be zero if no topology is relevant
    */
   unsigned int num_oc;
 
@@ -1043,12 +1043,12 @@ register_hosts (void *cls)
 
 
 /**
- * Callback to signal successfull startup of the controller process
+ * Callback to signal successful startup of the controller process
  *
  * @param cls the closure from GNUNET_TESTBED_controller_start()
  * @param cfg the configuration with which the controller has been started;
  *          NULL if status is not GNUNET_OK
- * @param status GNUNET_OK if the startup is successfull; GNUNET_SYSERR if not,
+ * @param status GNUNET_OK if the startup is successful; GNUNET_SYSERR if not,
  *          GNUNET_TESTBED_controller_stop() shouldn't be called in this case
  */
 static void
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index a9a340e99..0f7c0b15c 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -639,7 +639,7 @@ gen_topo_ring (struct TopologyContext *tc)
 
 /**
  * Returns the number of links that are required to generate a 2d torus for the
- * given number of peers. Also returns the arrangment (number of rows and the
+ * given number of peers. Also returns the arrangement (number of rows and the
  * length of each row)
  *
  * @param num_peers number of peers