193 files changed, 545 insertions, 528 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d8a869acb..5fd00e3f5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,4 @@
 # This Makefile.am is in the public domain
-#if WANT_FRAMEWORK
-#  INTLEMU_SUBDIRS = intlemu
-#endif
 if HAVE_TESTING
 TESTING = testing
diff --git a/src/abd/gnunet-abd.c b/src/abd/gnunet-abd.c
index ff7dd09c5..b1fb767e3 100644
--- a/src/abd/gnunet-abd.c
+++ b/src/abd/gnunet-abd.c
@@ -484,7 +484,7 @@ parse_expiration (const char *expirationstring,
 static void
 error_cb (void *cls)
 {
-  fprintf (stderr, "Error occured during lookup, shutting down.\n");
+  fprintf (stderr, "Error occurred during lookup, shutting down.\n");
  GNUNET_SCHEDULER_shutdown ();
  return;
 }
@@ -499,7 +499,7 @@ add_continuation (void *cls, int32_t success, const char *emsg)
  if (GNUNET_OK == success)
    printf ("Adding successful.\n");
  else
-    fprintf (stderr, "Error occured during adding, shutting down.\n");
+    fprintf (stderr, "Error occurred during adding, shutting down.\n");
  GNUNET_SCHEDULER_shutdown ();
 }
diff --git a/src/abd/gnunet-service-abd.c b/src/abd/gnunet-service-abd.c
index 569d42295..93368da45 100644
--- a/src/abd/gnunet-service-abd.c
+++ b/src/abd/gnunet-service-abd.c
@@ -721,7 +721,7 @@ handle_bidirectional_match (struct DelegationSetQueueEntry *actual_entry,
                                 tmp_set->delegation_chain_entry);
    // if one node on the path still needs solutions, this current
-    // patch cannot fullfil the conditions and therefore stops here
+    // patch cannot fulfill the conditions and therefore stops here
    // however, it is in the vrh and can be used by the other paths
    // related to this path/collection/verification
    if (0 < tmp_set->parent_queue_entry->required_solutions)
@@ -1334,7 +1334,7 @@ delegation_chain_fw_resolution_start (void *cls)
  }
  // Pre-check with vrh->dele_chain_.. if match issuer_key
-  // otherwise FW: start mutliple lookups for each vrh->dele_chain
+  // otherwise FW: start multiple lookups for each vrh->dele_chain
  // A.a <- ...
  // X.x <- C
  // Y.y <- C
@@ -1562,7 +1562,7 @@ delegate_collection_finished (void *cls)
  if (GNUNET_ABD_FLAG_BACKWARD & vrh->resolution_algo &&
      GNUNET_ABD_FLAG_FORWARD & vrh->resolution_algo)
  {
-    // if premature match found don't start bw resultion
+    // if premature match found don't start bw resolution
    if (1 == delegation_chain_fw_resolution_start (vrh))
      return;
    delegation_chain_bw_resolution_start (vrh);
@@ -1603,8 +1603,8 @@ handle_delegate_collection_cb (void *cls,
      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Invalid delegate found\n");
      continue;
    }
-    // only add the entries that are explicity marked as private
+    // only add the entries that are explicitly marked as private
-    // and therefor symbolize the end of a chain
+    // and therefore symbolize the end of a chain
    if (rd[i].flags & GNUNET_GNSRECORD_RF_PRIVATE)
    {
      del_entry = GNUNET_new (struct DelegateRecordEntry);
diff --git a/src/ats/ats_api_scheduling.c b/src/ats/ats_api_scheduling.c
index 36162d12f..ea4b27653 100644
--- a/src/ats/ats_api_scheduling.c
+++ b/src/ats/ats_api_scheduling.c
@@ -704,7 +704,7 @@ GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar,
 /**
 * A session was destroyed, disassociate it from the
 * given address record.  If this was an incoming
- * addess, destroy the address as well.
+ * address, destroy the address as well.
 *
 * @param ar address record to update information for
 * @param session session handle
diff --git a/src/ats/gnunet-service-ats_preferences.c b/src/ats/gnunet-service-ats_preferences.c
index 636e2db47..0869c65dc 100644
--- a/src/ats/gnunet-service-ats_preferences.c
+++ b/src/ats/gnunet-service-ats_preferences.c
@@ -47,7 +47,7 @@
 #define PREF_AGING_FACTOR 0.95
 /**
- * What is the lowest threshold up to which prefernce values
+ * What is the lowest threshold up to which preference values
 * are aged, and below which we consider them zero and thus
 * no longer subject to aging?
 */
@@ -211,7 +211,7 @@ sum_relative_preferences (void *cls,
 /**
- * Update the total releative preference for a peer by summing
+ * Update the total relative preference for a peer by summing
 * up the relative preferences all clients have for this peer.
 *
 * @param id peer id of the peer for which we should do the update
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index 2fbadef4d..363d0cfc9 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -174,7 +174,7 @@ struct Iteration
 /**
- * Result for a solver calculcation
+ * Result for a solver calculation
 */
 struct Result
 {
@@ -1310,7 +1310,7 @@ run (void *cls, char *const *args, const char *cfgfile,
  }
  GNUNET_free (src_filename);
-  /* Calculcate peers */
+  /* Calculate peers */
  if ((0 == ph.N_peers_start) && (0 == ph.N_peers_end))
  {
    ph.N_peers_start = DEFAULT_PEERS_START;
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c
index 52476c825..d3062a5c0 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -1051,7 +1051,7 @@ GAS_proportional_address_add (void *solver,
 * - Removed it from specific network
 * - Decrease the number of total addresses
 * - If active:
- *   - decrease number of active addreses
+ *   - decrease number of active addresses
 *   - update quotas
 *
 * @param solver the solver handle
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 45cc508a6..c9f0722d5 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -230,7 +230,7 @@ destroy_channel (struct GNUNET_CADET_Channel *ch)
 /**
- * Reconnect to the service, retransmit all infomation to try to restore the
+ * Reconnect to the service, retransmit all information to try to restore the
 * original state.
 *
 * @param h handle to the cadet
@@ -265,8 +265,8 @@ open_port_cb (void *cls, const struct GNUNET_HashCode *id, void *value)
 /**
- * Reconnect callback: tries to reconnect again after a failer previous
+ * Reconnect callback: tries to reconnect again after a failed previous
- * reconnecttion
+ * connection
 *
 * @param cls closure (cadet handle)
 */
@@ -706,7 +706,7 @@ handle_mq_error (void *cls, enum GNUNET_MQ_Error error)
 /**
- * Reconnect to the service, retransmit all infomation to try to restore the
+ * Reconnect to the service, retransmit all information to try to restore the
 * original state.
 *
 * @param h handle to the cadet
@@ -858,7 +858,7 @@ GNUNET_CADET_channel_destroy (struct GNUNET_CADET_Channel *channel)
 *
 * @param channel Channel handle.
 * @param option Query (GNUNET_CADET_OPTION_*).
- * @param ... dependant on option, currently not used
+ * @param ... dependent on option, currently not used
 *
 * @return Union with an answer to the query.
 */
@@ -955,7 +955,7 @@ return_agpl (void *cls, const struct GNUNET_MessageHeader *msg)
 /**
- * Open a port to receive incomming MQ-based channels.
+ * Open a port to receive incoming MQ-based channels.
 *
 * @param h CADET handle.
 * @param port Hash identifying the port.
diff --git a/src/cadet/gnunet-cadet-profiler.c b/src/cadet/gnunet-cadet-profiler.c
index c3a19a399..e61053f94 100644
--- a/src/cadet/gnunet-cadet-profiler.c
+++ b/src/cadet/gnunet-cadet-profiler.c
@@ -250,9 +250,9 @@ static struct GNUNET_SCHEDULER_Task *round_task;
 * START THE TEST ITSELF, AS WE ARE CONNECTED TO THE CADET SERVICES.
 *
 * Testcase continues when the root receives confirmation of connected peers,
- * on callback funtion ch.
+ * on callback function ch.
 *
- * @param cls Closure (unsued).
+ * @param cls Closure (unused).
 */
 static void
 start_test (void *cls);
@@ -290,7 +290,7 @@ get_index (struct CadetPeer *peer)
 /**
- * Show the results of the test (banwidth acheived) and log them to GAUGER
+ * Show the results of the test (banwidth achieved) and log them to GAUGER
 */
 static void
 show_end_data (void)
@@ -594,7 +594,7 @@ next_rnd (void *cls)
 * Transmit ping callback.
 *
 * @param cls Closure (peer for PING, NULL for PONG).
- * @param size Size of the tranmist buffer.
+ * @param size Size of the transmit buffer.
 * @param buf Pointer to the beginning of the buffer.
 *
 * @return Number of bytes written to buf.
@@ -911,9 +911,9 @@ select_random_peer (struct CadetPeer *peer)
 * START THE TEST ITSELF, AS WE ARE CONNECTED TO THE CADET SERVICES.
 *
 * Testcase continues when the root receives confirmation of connected peers,
- * on callback funtion ch.
+ * on callback function ch.
 *
- * @param cls Closure (unsued).
+ * @param cls Closure (unused).
 */
 static void
 start_test (void *cls)
@@ -993,7 +993,7 @@ warmup (void)
 * @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
 peer_id_cb (void *cls,
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index ae5d9210f..9a2180cc1 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -382,7 +382,7 @@ struct CadetChannel
  int destroy;
  /**
-   * Type of message to be droped. See GCT_send.
+   * Type of message to be dropped. See GCT_send.
   */
  uint16_t type GNUNET_PACKED;
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index 3e1f779ad..637e8663b 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -424,7 +424,7 @@ GCC_ack_expected (const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid)
  cc = GCC_lookup (cid);
  if (NULL == cc)
-    return; /* whopise, connection alredy down? */
+    return; /* whopise, connection already down? */
  cc->metrics.num_acked_transmissions++;
 }
@@ -444,7 +444,7 @@ GCC_ack_observed (const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid)
  cc = GCC_lookup (cid);
  if (NULL == cc)
-    return; /* whopise, connection alredy down? */
+    return; /* whopise, connection already down? */
  cc->metrics.num_successes++;
 }
@@ -467,7 +467,7 @@ GCC_latency_observed (const struct GNUNET_CADET_ConnectionTunnelIdentifier *cid,
  cc = GCC_lookup (cid);
  if (NULL == cc)
-    return; /* whopise, connection alredy down? */
+    return; /* whopise, connection already down? */
  GNUNET_STATISTICS_update (stats, "# latencies observed", 1, GNUNET_NO);
  cc->latency_datapoints++;
  if (cc->latency_datapoints >= 7)
diff --git a/src/cadet/gnunet-service-cadet_dht.c b/src/cadet/gnunet-service-cadet_dht.c
index e1bbeb2c3..6caac474d 100644
--- a/src/cadet/gnunet-service-cadet_dht.c
+++ b/src/cadet/gnunet-service-cadet_dht.c
@@ -102,7 +102,7 @@ static struct GNUNET_TIME_Relative announce_delay;
 * @param exp when will this value expire
 * @param key key of the result
 * @param get_path path of the get request
- * @param get_path_length lenght of @a get_path
+ * @param get_path_length length of @a get_path
 * @param put_path path of the put request
 * @param put_path_length length of the @a put_path
 * @param type type of the result
diff --git a/src/cadet/gnunet-service-cadet_paths.c b/src/cadet/gnunet-service-cadet_paths.c
index 087515a5e..2da4e2708 100644
--- a/src/cadet/gnunet-service-cadet_paths.c
+++ b/src/cadet/gnunet-service-cadet_paths.c
@@ -87,7 +87,7 @@ recalculate_path_desirability (struct CadetPeerPath *path)
 /**
 * Return how much we like keeping the path.  This is an aggregate
 * score based on various factors, including the age of the path
- * (older == better), and the value of this path to all of its ajacent
+ * (older == better), and the value of this path to all of its adjacent
 * peers.  For example, long paths that end at a peer that we have no
 * shorter way to reach are very desirable, while long paths that end
 * at a peer for which we have a shorter way as well are much less
@@ -462,7 +462,7 @@ extend_path (struct CadetPeerPath *path,
 * if applicable.
 *
 * @param get_path path of the get request
- * @param get_path_length lenght of @a get_path
+ * @param get_path_length length of @a get_path
 * @param put_path path of the put request
 * @param put_path_length length of the @a put_path
 * @return a path through the network
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index 221364c5d..2437a3e1b 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -304,8 +304,8 @@ GCP_get_desirability_of_path (struct CadetPeer *cp,
 #endif
  avg_sum = off_sum * 1.0 / cp->path_dll_length;
  path_delta = off - avg_sum;
-  /* path_delta positiv: path off of peer above average (bad path for peer),
+  /* path_delta positive: path off of peer above average (bad path for peer),
-     path_delta negativ: path off of peer below average (good path for peer) */
+     path_delta negative: path off of peer below average (good path for peer) */
  if (path_delta <= -1.0)
    weight_alts = -num_alts / path_delta;  /* discount alternative paths */
  else if (path_delta >= 1.0)
@@ -405,7 +405,7 @@ consider_peer_activate (struct CadetPeer *cp)
       (NULL == cp->core_mq) ? "" : " with CORE link");
  if (NULL != cp->destroy_task)
  {
-    /* It's active, do not destory! */
+    /* It's active, do not destroy! */
    GNUNET_SCHEDULER_cancel (cp->destroy_task);
    cp->destroy_task = NULL;
  }
@@ -946,7 +946,7 @@ path_heap_cleanup (void *cls)
         2 * DESIRED_CONNECTIONS_PER_TUNNEL)
  {
    /* Now we have way too many, drop least desirable UNLESS it is in use!
-       (Note that this intentionally keeps highly desireable, but currently
+       (Note that this intentionally keeps highly desirable, but currently
       unused paths around in the hope that we might be able to switch, even
       if the number of paths exceeds the threshold.) */
    root = GNUNET_CONTAINER_heap_peek (cp->path_heap);
@@ -1056,7 +1056,7 @@ GCP_detach_path (struct CadetPeer *cp,
                 struct GNUNET_CONTAINER_HeapNode *hn)
 {
  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Detatching path %s from peer %s\n",
+       "Detaching path %s from peer %s\n",
       GCPP_2s (path),
       GCP_2s (cp));
  GNUNET_assert (path ==
@@ -1117,7 +1117,7 @@ GCP_remove_connection (struct CadetPeer *cp,
 /**
- * Retrieve the CadetPeer stucture associated with the
+ * Retrieve the CadetPeer structure associated with the
 * peer. Optionally create one and insert it in the appropriate
 * structures if the peer is not known yet.
 *
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c
index c1c511da1..cabbeed0c 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -238,7 +238,7 @@ struct CadetTunnelAxolotl
  int ratchet_allowed;
  /**
-   * Number of messages recieved since our last ratchet advance.
+   * Number of messages received since our last ratchet advance.
   *
   * If this counter = 0, we cannot send a new ratchet key in the next
   * message.
@@ -1108,7 +1108,7 @@ store_skipped_key (struct CadetTunnelAxolotl *ax,
 * @param HKr Header key.
 * @param Np Received meesage number.
 * @return #GNUNET_OK if keys were stored.
- *         #GNUNET_SYSERR if an error ocurred (@a Np not expected).
+ *         #GNUNET_SYSERR if an error occurred (@a Np not expected).
 */
 static int
 store_ax_keys (struct CadetTunnelAxolotl *ax,
@@ -3030,7 +3030,7 @@ GCT_send_channel_destroy (struct CadetTunnel *t,
  struct GNUNET_CADET_ChannelDestroyMessage msg;
  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Sending DESTORY message for channel ID %u\n",
+       "Sending DESTROY message for channel ID %u\n",
       ntohl (ctn.cn));
  msg.header.size = htons (sizeof(msg));
  msg.header.type = htons (GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY);
@@ -3105,7 +3105,7 @@ handle_plaintext_channel_destroy (void *cls,
    /* We don't know about such a channel, might have been destroyed on our
       end in the meantime, or never existed. */
    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Received channel DESTORY for unknown channel %u. Ignoring.\n",
+         "Received channel DESTROY for unknown channel %u. Ignoring.\n",
         ntohl (cm->ctn.cn));
    return;
  }
@@ -3157,7 +3157,7 @@ decrypted_error_cb (void *cls,
 /**
- * Create a tunnel to @a destionation.  Must only be called
+ * Create a tunnel to @a destination.  Must only be called
 * from within #GCP_get_tunnel().
 *
 * @param destination where to create the tunnel to
@@ -3220,7 +3220,7 @@ GCT_create_tunnel (struct CadetPeer *destination)
 * Add a @a connection to the @a tunnel.
 *
 * @param t a tunnel
- * @param cid connection identifer to use for the connection
+ * @param cid connection identifier to use for the connection
 * @param options options for the connection
 * @param path path to use for the connection
 * @return #GNUNET_OK on success,
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index 23f2ccbe3..bdf2ac986 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -224,7 +224,7 @@ static struct GNUNET_CADET_Channel *incoming_ch;
 /**
 * Time we started the data transmission (after channel has been established
- * and initilized).
+ * and initialized).
 */
 static struct GNUNET_TIME_Absolute start_time;
@@ -292,7 +292,7 @@ get_target_channel ()
 /**
- * Show the results of the test (banwidth acheived) and log them to GAUGER
+ * Show the results of the test (banwidth achieved) and log them to GAUGER
 */
 static void
 show_end_data (void)
@@ -1311,7 +1311,7 @@ start_test (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/cadet/test_cadet_flow.c b/src/cadet/test_cadet_flow.c
index 2fbdd8d50..9f5a45986 100644
--- a/src/cadet/test_cadet_flow.c
+++ b/src/cadet/test_cadet_flow.c
@@ -176,7 +176,7 @@ static struct GNUNET_CADET_Channel *incoming_ch;
 /**
 * Time we started the data transmission (after channel has been established
- * and initilized).
+ * and initialized).
 */
 static struct GNUNET_TIME_Absolute start_time;
@@ -207,7 +207,7 @@ static unsigned int msg_dropped;
 /**
- * Show the results of the test (banwidth acheived) and log them to GAUGER
+ * Show the results of the test (banwidth achieved) and log them to GAUGER
 */
 static void
 show_end_data (void)
@@ -743,7 +743,7 @@ start_test (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/consensus/gnunet-consensus-profiler.c b/src/consensus/gnunet-consensus-profiler.c
index 65fc23d8f..07a536a2d 100644
--- a/src/consensus/gnunet-consensus-profiler.c
+++ b/src/consensus/gnunet-consensus-profiler.c
@@ -384,7 +384,7 @@ disconnect_adapter (void *cls, void *op_result)
 * @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
 peer_info_cb (void *cb_cls,
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c
index 371b7f67f..5b6b9bbd7 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -357,7 +357,7 @@ struct ReferendumEntry
   * whether the peer finished the whole referendum.
   *
   * Votes from peers are only counted if they're
-   * marked as commited (#GNUNET_YES) in the referendum.
+   * marked as committed (#GNUNET_YES) in the referendum.
   *
   * Otherwise (#GNUNET_NO), the requested changes are
   * not counted for majority votes or thresholds.
@@ -2232,7 +2232,7 @@ task_start_reconcile (struct TaskEntry *task)
  if ((task->key.peer1 == session->local_peer_idx) && (task->key.peer2 ==
                                                       session->local_peer_idx))
  {
-    /* XXX: mark the corresponding rfn as commited if necessary */
+    /* XXX: mark the corresponding rfn as committed if necessary */
    finish_task (task);
    return;
  }
@@ -2642,7 +2642,7 @@ lookup_task (const struct ConsensusSession *session,
 *        to accept it, otherwise the request will be refused
 *        Note that we don't use a return value here, as it is also
 *        necessary to specify the set we want to do the operation with,
- *        whith sometimes can be derived from the context message.
+ *        which sometimes can be derived from the context message.
 *        Also necessary to specify the timeout.
 */
 static void
@@ -2705,7 +2705,7 @@ set_listen_cb (void *cls,
  if (task->key.peer2 != session->local_peer_idx)
  {
-    /* We're being asked, so we must be thne 2nd peer. */
+    /* We're being asked, so we must be the 2nd peer. */
    GNUNET_break_op (0);
    return;
  }
diff --git a/src/conversation/gnunet-conversation-test.c b/src/conversation/gnunet-conversation-test.c
index 9f8e54033..5e6bc805f 100644
--- a/src/conversation/gnunet-conversation-test.c
+++ b/src/conversation/gnunet-conversation-test.c
@@ -143,7 +143,7 @@ switch_to_speaker (void *cls)
  }
  fprintf (stderr,
           _ (
-             "\nWe are now playing your recording back.  If you can hear it, your audio settings are working..."));
+             "\new are now playing your recording back.  If you can hear it, your audio settings are working..."));
  for (struct Recording *rec = rec_head; NULL != rec; rec = rec->next)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/conversation/gnunet-helper-audio-record.c b/src/conversation/gnunet-helper-audio-record.c
index 633030a64..060a7c779 100644
--- a/src/conversation/gnunet-helper-audio-record.c
+++ b/src/conversation/gnunet-helper-audio-record.c
@@ -60,7 +60,7 @@
 #define FRAME_SIZE (SAMPLING_RATE / 1000 * FRAME_SIZE_MS)
 /**
- * Pages are commited when their size goes over this value.
+ * Pages are committed when their size goes over this value.
 * Note that in practice we flush pages VERY often (every frame),
 * which means that pages NEVER really get to be this big.
 * With one-packet-per-page, pages are roughly 100-300 bytes each.
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 34f8440ae..8f53072d9 100644
--- a/src/core/gnunet-service-core.c
+++ b/src/core/gnunet-service-core.c
@@ -804,7 +804,7 @@ GSC_CLIENTS_deliver_message (const struct GNUNET_PeerIdentity *sender,
          being kept if we are just barely below the hard max,
          and a 99% chance of being kept if we are at the soft max.
       The reason is to make it more likely to drop control traffic
-       (ACK, queries) which may be cummulative or highly redundant,
+       (ACK, queries) which may be cumulative or highly redundant,
       and cheap to drop than data traffic.  */qlen = GNUNET_MQ_get_length (c->mq);
    if ((qlen >= HARD_MAX_QUEUE) ||
        ((qlen > SOFT_MAX_QUEUE) &&
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c
index 6c446fc7c..d40b3bfad 100644
--- a/src/core/gnunet-service-core_sessions.c
+++ b/src/core/gnunet-service-core_sessions.c
@@ -886,7 +886,7 @@ GSC_SESSIONS_transmit (struct GSC_ClientActiveRequest *car,
    sme->deadline =
      GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_MAX_CORK_DELAY);
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Mesage corked, delaying transmission\n");
+                "Message corked, delaying transmission\n");
  }
  pos = session->sme_head;
  while ((NULL != pos) && (pos->priority >= sme->priority))
diff --git a/src/datastore/datastore_api.c b/src/datastore/datastore_api.c
index bd7a612ed..d658b9c85 100644
--- a/src/datastore/datastore_api.c
+++ b/src/datastore/datastore_api.c
@@ -36,7 +36,7 @@
 #define DELAY_WARN_TIMEOUT GNUNET_TIME_UNIT_MINUTES
 /**
- * Collect an instane number of statistics?  May cause excessive IPC.
+ * Collect an instance number of statistics?  May cause excessive IPC.
 */
 #define INSANE_STATISTICS GNUNET_NO
@@ -515,7 +515,7 @@ GNUNET_DATASTORE_disconnect (struct GNUNET_DATASTORE_Handle *h,
 /**
- * Create a new entry for our priority queue (and possibly discard other entires if
+ * Create a new entry for our priority queue (and possibly discard other entries if
 * the queue is getting too long).
 *
 * @param h handle to the datastore
diff --git a/src/datastore/plugin_datastore_mysql.c b/src/datastore/plugin_datastore_mysql.c
index 15c2fe386..4f0e0838e 100644
--- a/src/datastore/plugin_datastore_mysql.c
+++ b/src/datastore/plugin_datastore_mysql.c
@@ -74,7 +74,7 @@
      password=$the_password_you_like
   @endverbatim
 *
- * Thats it. Note that .my.cnf file is a security risk unless its on
+ * That's it. Note that .my.cnf file is a security risk unless its on
 * a safe partition etc. The $HOME/.my.cnf can of course be a symbolic
 * link. Even greater security risk can be achieved by setting no
 * password for $USER.  Luckily $USER has only privileges to mess
diff --git a/src/datastore/plugin_datastore_postgres.c b/src/datastore/plugin_datastore_postgres.c
index 6a5d45832..66929f91a 100644
--- a/src/datastore/plugin_datastore_postgres.c
+++ b/src/datastore/plugin_datastore_postgres.c
@@ -281,7 +281,7 @@ postgres_plugin_put (void *cls,
            key,
            size,
            GNUNET_SYSERR,
-            _ ("Postgress exec failure"));
+            _ ("Postgresql exec failure"));
      return;
    }
    bool affected = (0 != ret);
@@ -322,7 +322,7 @@ postgres_plugin_put (void *cls,
            key,
            size,
            GNUNET_SYSERR,
-            "Postgress exec failure");
+            "Postgresql exec failure");
      return;
    }
  }
@@ -894,7 +894,7 @@ postgres_plugin_remove_key (void *cls,
          key,
          size,
          GNUNET_SYSERR,
-          _ ("Postgress exec failure"));
+          _ ("Postgresql exec failure"));
    return;
  }
  if (GNUNET_DB_STATUS_SUCCESS_NO_RESULTS == ret)
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index 27eba018f..f4a17e32a 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -530,7 +530,7 @@ handle_dns_request (void *cls,
  size_t mlen = ntohs (msg->header.size);
  size_t dlen = mlen - sizeof(struct GNUNET_MessageHeader);
  char buf[dlen] GNUNET_ALIGN;
-  struct GNUNET_TUN_DnsHeader *dout;
+  struct GNUNET_TUN_DnsHeader *dns_out;
  if (GNUNET_SYSERR == ts->is_dns)
  {
@@ -548,8 +548,8 @@ handle_dns_request (void *cls,
  GNUNET_memcpy (buf,
                 &msg->dns,
                 dlen);
-  dout = (struct GNUNET_TUN_DnsHeader *) buf;
+  dns_out = (struct GNUNET_TUN_DnsHeader *) buf;
-  dout->id = ts->specifics.dns.my_id;
+  dns_out->id = ts->specifics.dns.my_id;
  ts->specifics.dns.rs = GNUNET_DNSSTUB_resolve (dnsstub,
                                                 buf,
                                                 dlen,
@@ -2301,7 +2301,7 @@ handle_icmp_service (void *cls,
  setup_state_record (state);
  /* check that ICMP type is something we want to support,
-     perform ICMP PT if needed ans possibly make up payload */
+     perform ICMP PT if needed and possibly make up payload */
  switch (msg->af)
  {
  case AF_INET:
diff --git a/src/exit/gnunet-helper-exit.c b/src/exit/gnunet-helper-exit.c
index 4a6c66deb..4f32ea1f1 100644
--- a/src/exit/gnunet-helper-exit.c
+++ b/src/exit/gnunet-helper-exit.c
@@ -188,7 +188,7 @@ fork_and_exec (const char *file,
 /**
 * Creates a tun-interface called dev;
 *
- * @param dev is asumed to point to a char[IFNAMSIZ]
+ * @param dev is assumed to point to a char[IFNAMSIZ]
 *        if *dev == '\\0', uses the name supplied by the kernel;
 * @return the fd to the tun or -1 on error
 */
diff --git a/src/fragmentation/defragmentation.c b/src/fragmentation/defragmentation.c
index 92ae9f595..c0ca86b37 100644
--- a/src/fragmentation/defragmentation.c
+++ b/src/fragmentation/defragmentation.c
@@ -114,7 +114,7 @@ struct MessageContext
  unsigned int frag_times_start_offset;
  /**
-   * Which offset whould we write the next frag value into
+   * Which offset would we write the next frag value into
   * in the @e frag_times array? All smaller entries are valid.
   */
  unsigned int frag_times_write_offset;
diff --git a/src/fragmentation/fragmentation.c b/src/fragmentation/fragmentation.c
index 36e1c33f4..a2e097b8b 100644
--- a/src/fragmentation/fragmentation.c
+++ b/src/fragmentation/fragmentation.c
@@ -461,7 +461,7 @@ GNUNET_FRAGMENT_process_ack (struct GNUNET_FRAGMENT_Context *fc,
                            GNUNET_NO);
  if (abits != (fc->acks & abits))
  {
-    /* ID collission or message reordering, count! This should be rare! */
+    /* ID collision or message reordering, count! This should be rare! */
    GNUNET_STATISTICS_update (fc->stats,
                              _ ("# bits removed from fragmentation ACKs"), 1,
                              GNUNET_NO);
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index 920786146..63b17a93e 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -584,7 +584,7 @@ GNUNET_FS_data_reader_copy_ (void *cls,
 *
 * @param h master context
 * @param ext component of the path
- * @param ent entity identifier (or emtpy string for the directory)
+ * @param ent entity identifier (or empty string for the directory)
 * @return NULL on error
 */
 static char *
@@ -624,7 +624,7 @@ get_serialization_file_name (struct GNUNET_FS_Handle *h,
 * @param h master context
 * @param ext component of the path
 * @param uni name of the parent operation
- * @param ent entity identifier (or emtpy string for the directory)
+ * @param ent entity identifier (or empty string for the directory)
 * @return NULL on error
 */
 static char *
@@ -664,7 +664,7 @@ get_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h,
 *
 * @param h master context
 * @param ext component of the path
- * @param ent entity identifier (or emtpy string for the directory)
+ * @param ent entity identifier (or empty string for the directory)
 * @return NULL on error
 */
 static struct GNUNET_BIO_ReadHandle *
@@ -687,7 +687,7 @@ get_read_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent)
 *
 * @param h master context
 * @param ext component of the path
- * @param ent entity identifier (or emtpy string for the directory)
+ * @param ent entity identifier (or empty string for the directory)
 * @return NULL on error
 */
 static struct GNUNET_BIO_WriteHandle *
@@ -712,7 +712,7 @@ get_write_handle (struct GNUNET_FS_Handle *h, const char *ext, const char *ent)
 * @param h master context
 * @param ext component of the path
 * @param uni name of parent
- * @param ent entity identifier (or emtpy string for the directory)
+ * @param ent entity identifier (or empty string for the directory)
 * @return NULL on error
 */
 static struct GNUNET_BIO_WriteHandle *
@@ -877,7 +877,7 @@ read_start_time (struct GNUNET_BIO_ReadHandle *rh,
 *
 * @param h master context
 * @param filename name of the file (without directory) with
- *        the infromation
+ *        the information
 * @return NULL on error
 */
 static struct GNUNET_FS_FileInformation *
@@ -890,7 +890,7 @@ deserialize_file_information (struct GNUNET_FS_Handle *h, const char *filename);
 *
 * @param h master context
 * @param fn name of the file (without directory) with
- *        the infromation
+ *        the information
 * @param rh handle for reading
 * @return NULL on error
 */
@@ -1152,7 +1152,7 @@ cleanup:
 *
 * @param h master context
 * @param filename name of the file (without directory) with
- *        the infromation
+ *        the information
 * @return NULL on error
 */
 static struct GNUNET_FS_FileInformation *
@@ -1230,7 +1230,7 @@ get_serialization_short_name (const char *fullname)
 *
 * @param h master context
 * @param ext component of the path
- * @return NULL on errror
+ * @return NULL on error
 */
 static char *
 make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext)
@@ -1266,7 +1266,7 @@ make_serialization_file_name (struct GNUNET_FS_Handle *h, const char *ext)
 * @param h master context
 * @param ext component of the path
 * @param uni name of parent
- * @return NULL on errror
+ * @return NULL on error
 */
 static char *
 make_serialization_file_name_in_dir (struct GNUNET_FS_Handle *h,
@@ -2535,7 +2535,7 @@ static int
 deserialize_search_result (void *cls, const char *filename)
 {
  struct GNUNET_FS_SearchContext *sc = cls;
-  char *ser;
+  char *serialized;
  char *uris;
  char *emsg;
  char *download;
@@ -2544,19 +2544,19 @@ deserialize_search_result (void *cls, const char *filename)
  struct GNUNET_BIO_ReadHandle *drh;
  struct GNUNET_FS_SearchResult *sr;
-  ser = get_serialization_short_name (filename);
+  serialized = get_serialization_short_name (filename);
  rh = GNUNET_BIO_read_open_file (filename);
  if (NULL == rh)
  {
-    if (NULL != ser)
+    if (NULL != serialized)
    {
      remove_sync_file_in_dir (sc->h,
                               (NULL == sc->psearch_result)
                               ? GNUNET_FS_SYNC_PATH_MASTER_SEARCH
                               : GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
                               sc->serialization,
-                               ser);
+                               serialized);
-      GNUNET_free (ser);
+      GNUNET_free (serialized);
    }
    return GNUNET_OK;
  }
@@ -2567,7 +2567,7 @@ deserialize_search_result (void *cls, const char *filename)
  sr = GNUNET_new (struct GNUNET_FS_SearchResult);
  sr->h = sc->h;
  sr->sc = sc;
-  sr->serialization = ser;
+  sr->serialization = serialized;
  if ((GNUNET_OK !=
       GNUNET_BIO_read_string (rh, "result-uri", &uris, 10 * 1024)) ||
      (NULL == (sr->uri = GNUNET_FS_uri_parse (uris, &emsg))) ||
@@ -2850,32 +2850,32 @@ static int
 deserialize_subdownload (void *cls, const char *filename)
 {
  struct GNUNET_FS_DownloadContext *parent = cls;
-  char *ser;
+  char *serialized;
  char *emsg;
  struct GNUNET_BIO_ReadHandle *rh;
-  ser = get_serialization_short_name (filename);
+  serialized = get_serialization_short_name (filename);
  rh = GNUNET_BIO_read_open_file (filename);
  if (NULL == rh)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                _ (
                  "Failed to resume sub-download `%s': could not open file `%s'\n"),
-                ser,
+                serialized,
                filename);
-    GNUNET_free (ser);
+    GNUNET_free (serialized);
    return GNUNET_OK;
  }
-  deserialize_download (parent->h, rh, parent, NULL, ser);
+  deserialize_download (parent->h, rh, parent, NULL, serialized);
  if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
  {
    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                _ ("Failed to resume sub-download `%s': %s\n"),
-                ser,
+                serialized,
                emsg);
    GNUNET_free (emsg);
  }
-  GNUNET_free (ser);
+  GNUNET_free (serialized);
  return GNUNET_OK;
 }
@@ -3146,7 +3146,7 @@ static int
 deserialize_search_file (void *cls, const char *filename)
 {
  struct GNUNET_FS_Handle *h = cls;
-  char *ser;
+  char *set;
  char *emsg;
  struct GNUNET_BIO_ReadHandle *rh;
  struct GNUNET_FS_SearchContext *sc;
@@ -3159,21 +3159,21 @@ deserialize_search_file (void *cls, const char *filename)
  }
  if (S_ISDIR (buf.st_mode))
    return GNUNET_OK; /* skip directories */
-  ser = get_serialization_short_name (filename);
+  set = get_serialization_short_name (filename);
  rh = GNUNET_BIO_read_open_file (filename);
  if (NULL == rh)
  {
-    if (NULL != ser)
+    if (NULL != set)
    {
-      GNUNET_FS_remove_sync_file_ (h, GNUNET_FS_SYNC_PATH_MASTER_SEARCH, ser);
+      GNUNET_FS_remove_sync_file_ (h, GNUNET_FS_SYNC_PATH_MASTER_SEARCH, set);
-      GNUNET_free (ser);
+      GNUNET_free (set);
    }
    return GNUNET_OK;
  }
-  sc = deserialize_search (h, rh, NULL, ser);
+  sc = deserialize_search (h, rh, NULL, set);
  if (NULL != sc)
    sc->top = GNUNET_FS_make_top (h, &GNUNET_FS_search_signal_suspend_, sc);
-  GNUNET_free (ser);
+  GNUNET_free (set);
  if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
  {
    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -3198,21 +3198,21 @@ static int
 deserialize_download_file (void *cls, const char *filename)
 {
  struct GNUNET_FS_Handle *h = cls;
-  char *ser;
+  char *set;
  char *emsg;
  struct GNUNET_BIO_ReadHandle *rh;
-  ser = get_serialization_short_name (filename);
+  set = get_serialization_short_name (filename);
  rh = GNUNET_BIO_read_open_file (filename);
  if (NULL == rh)
  {
    if (0 != unlink (filename))
      GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", filename);
-    GNUNET_free (ser);
+    GNUNET_free (set);
    return GNUNET_OK;
  }
-  deserialize_download (h, rh, NULL, NULL, ser);
+  deserialize_download (h, rh, NULL, NULL, set);
-  GNUNET_free (ser);
+  GNUNET_free (set);
  if (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg))
  {
    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -3226,7 +3226,7 @@ deserialize_download_file (void *cls, const char *filename)
 /**
- * Deserialize informatin about pending operations.
+ * Deserialize information about pending operations.
 *
 * @param master_path which master directory should be scanned
 * @param proc function to call for each entry (will get @a h for 'cls')
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index 9f0f12611..eb7aac5bb 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -350,7 +350,7 @@ struct GNUNET_FS_DirectoryBuilder
  struct BuilderEntry *head;
  /**
-   * Number of entires in the directory.
+   * Number of entries in the directory.
   */
  unsigned int count;
 };
@@ -401,7 +401,7 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
  size_t mds;
  size_t mdxs;
  char *uris;
-  char *ser;
+  char *serialized;
  char *sptr;
  size_t slen;
  struct GNUNET_CONTAINER_MetaData *meta;
@@ -456,10 +456,10 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
    mds = GNUNET_MAX_MALLOC_CHECKED / 2;
  e = GNUNET_malloc (sizeof(struct BuilderEntry) + slen + mds
                     + sizeof(uint32_t));
-  ser = (char *) &e[1];
+  serialized = (char *) &e[1];
-  GNUNET_memcpy (ser, uris, slen);
+  GNUNET_memcpy (serialized, uris, slen);
  GNUNET_free (uris);
-  sptr = &ser[slen + sizeof(uint32_t)];
+  sptr = &serialized[slen + sizeof(uint32_t)];
  ret =
    GNUNET_CONTAINER_meta_data_serialize (meta_use, &sptr, mds,
                                          GNUNET_CONTAINER_META_DATA_SERIALIZE_PART);
@@ -470,7 +470,7 @@ GNUNET_FS_directory_builder_add (struct GNUNET_FS_DirectoryBuilder *bld,
  else
    mds = ret;
  big = htonl (mds);
-  GNUNET_memcpy (&ser[slen], &big, sizeof(uint32_t));
+  GNUNET_memcpy (&serialized[slen], &big, sizeof(uint32_t));
  e->len = slen + sizeof(uint32_t) + mds;
  e->next = bld->head;
  bld->head = e;
@@ -496,7 +496,7 @@ do_align (size_t start_position, size_t end_position)
 /**
- * Compute a permuation of the blocks to
+ * Compute a permutation of the blocks to
 * minimize the cost of alignment.  Greedy packer.
 *
 * @param start starting position for the first block
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 1f8ce7c05..5c98d224a 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -343,7 +343,7 @@ full_recursive_download (struct GNUNET_FS_DownloadContext *dc)
      GNUNET_log (
        GNUNET_ERROR_TYPE_WARNING,
        _ (
-          "Failed to access full directroy contents of `%s' for recursive download\n"),
+          "Failed to access full directory contents of `%s' for recursive download\n"),
        dc->filename);
    }
    GNUNET_DISK_file_unmap (m);
@@ -1431,7 +1431,7 @@ try_reconnect (struct GNUNET_FS_DownloadContext *dc)
 * We're allowed to ask the FS service for our blocks.  Start the download.
 *
 * @param cls the 'struct GNUNET_FS_DownloadContext'
- * @param mq handle to use for communcation with FS (we must destroy it!)
+ * @param mq handle to use for communication with FS (we must destroy it!)
 */
 static void
 activate_fs_download (void *cls)
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index fddc65d67..f891f37a1 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -1431,7 +1431,7 @@ compute_contents_size (struct GNUNET_FS_FileInformation *fi)
 * @param h handle to the file sharing subsystem
 * @param fi information about the file or directory structure to publish
 * @param ns namespace to publish the file in, NULL for no namespace
- * @param nid identifier to use for the publishd content in the namespace
+ * @param nid identifier to use for the published content in the namespace
 *        (can be NULL, must be NULL if namespace is NULL)
 * @param nuid update-identifier that will be used for future updates
 *        (can be NULL, must be NULL if namespace or nid is NULL)
@@ -1560,7 +1560,7 @@ fip_signal_stop (void *cls,
 /**
 * Stop an upload.  Will abort incomplete uploads (but
- * not remove blocks that have already been publishd) or
+ * not remove blocks that have already been published) or
 * simply clean up the state for completed uploads.
 * Must NOT be called from within the event callback!
 *
diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c
index d5e75f9be..3610b202e 100644
--- a/src/fs/fs_sharetree.c
+++ b/src/fs/fs_sharetree.c
@@ -32,7 +32,7 @@
 /**
 * Entry for each unique keyword to track how often
- * it occured.  Contains the keyword and the counter.
+ * it occurred.  Contains the keyword and the counter.
 */
 struct KeywordCounter
 {
diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c
index 6203690d2..4d49809f8 100644
--- a/src/fs/fs_tree.c
+++ b/src/fs/fs_tree.c
@@ -434,7 +434,7 @@ GNUNET_FS_tree_encoder_get_uri (struct GNUNET_FS_TreeEncoder *te)
 * about possible errors.
 *
 * @param te the tree encoder to clean up
- * @param emsg set to an error message (if an error occured
+ * @param emsg set to an error message (if an error occurred
 *        within the tree encoder; if this function is called
 *        prior to completion and prior to an internal error,
 *        both "*emsg" will be set to NULL).
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 4d1b7c6f0..73ea5d60d 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -25,7 +25,7 @@
 *
 * GNUnet URIs are of the general form "gnunet://MODULE/IDENTIFIER".
 * The specific structure of "IDENTIFIER" depends on the module and
- * maybe differenciated into additional subcategories if applicable.
+ * maybe differentiated into additional subcategories if applicable.
 * This module only deals with fs identifiers (MODULE = "fs").
 * <p>
 *
@@ -213,7 +213,7 @@ GNUNET_FS_uri_ksk_to_string_fancy (const struct GNUNET_FS_Uri *uri)
 *
 * @param in string with %-encoding
 * @param emsg where to store the parser error message (if any)
- * @return decodded string with leading space (or preserved plus)
+ * @return decoded string with leading space (or preserved plus)
 */
 static char *
 percent_decode_keyword (const char *in, char **emsg)
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index dea467669..c62edcd61 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -508,7 +508,7 @@ uri_ksk_continuation (void *cls,
 * Iterate over the results from the directory scan and extract
 * the desired information for the publishing operation.
 *
- * @param item root with the data from the directroy scan
+ * @param item root with the data from the directory scan
 * @return handle with the information for the publishing operation
 */
 static struct GNUNET_FS_FileInformation *
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c
index cf9069918..e90ba4c8b 100644
--- a/src/fs/gnunet-service-fs.c
+++ b/src/fs/gnunet-service-fs.c
@@ -63,7 +63,7 @@
    GNUNET_TIME_UNIT_SECONDS, 5)
 /**
- * Collect an instane number of statistics?  May cause excessive IPC.
+ * Collect an instance number of statistics?  May cause excessive IPC.
 */
 #define INSANE_STATISTICS GNUNET_NO
diff --git a/src/fs/gnunet-service-fs_cadet_client.c b/src/fs/gnunet-service-fs_cadet_client.c
index 96ccf8232..398fcd604 100644
--- a/src/fs/gnunet-service-fs_cadet_client.c
+++ b/src/fs/gnunet-service-fs_cadet_client.c
@@ -655,7 +655,7 @@ GSF_cadet_query (const struct GNUNET_PeerIdentity *target,
 /**
 * Cancel an active request; must not be called after 'proc'
- * was calld.
+ * was called.
 *
 * @param sr request to cancel
 */
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c
index dca8ae2a8..c174ad611 100644
--- a/src/fs/gnunet-service-fs_cp.c
+++ b/src/fs/gnunet-service-fs_cp.c
@@ -53,7 +53,7 @@
                                                     2)
 /**
- * Collect an instane number of statistics?  May cause excessive IPC.
+ * Collect an instance number of statistics?  May cause excessive IPC.
 */
 #define INSANE_STATISTICS GNUNET_NO
diff --git a/src/fs/gnunet-service-fs_pe.c b/src/fs/gnunet-service-fs_pe.c
index bb4b07c02..60dd0ab70 100644
--- a/src/fs/gnunet-service-fs_pe.c
+++ b/src/fs/gnunet-service-fs_pe.c
@@ -30,7 +30,7 @@
 #include "gnunet-service-fs_pr.h"
 /**
- * Collect an instane number of statistics?  May cause excessive IPC.
+ * Collect an instance number of statistics?  May cause excessive IPC.
 */
 #define INSANE_STATISTICS GNUNET_NO
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index 150dd72e2..a5db4b6b7 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -49,7 +49,7 @@
 /**
 * Bandwidth value of a 0-priority content (must be fairly high
 * compared to query since content is typically significantly larger
- * -- and more valueable since it can take many queries to get one
+ * -- and more valuable since it can take many queries to get one
 * piece of content).
 */
 #define CONTENT_BANDWIDTH_VALUE 800
@@ -60,7 +60,7 @@
 #define MAX_RESULTS (100 * 1024)
 /**
- * Collect an instane number of statistics?  May cause excessive IPC.
+ * Collect an instance number of statistics?  May cause excessive IPC.
 */
 #define INSANE_STATISTICS GNUNET_NO
@@ -241,7 +241,7 @@ static unsigned long long max_pending_requests = (32 * 1024);
 * will create a new bloom filter from scratch, so it should only be
 * called if we have no bloomfilter at all (and hence can create a
 * fresh one of minimal size without problems) OR if our peer is the
- * initiator (in which case we may resize to larger than mimimum size).
+ * initiator (in which case we may resize to larger than minimum size).
 *
 * @param type type of the request
 * @param pr request for which the BF is to be recomputed
@@ -287,7 +287,7 @@ refresh_bloomfilter (enum GNUNET_BLOCK_Type type, struct GSF_PendingRequest *pr)
 * @param bf_size number of bytes in @a bf_data
 * @param mingle mingle value for bf
 * @param anonymity_level desired anonymity level
- * @param priority maximum outgoing cummulative request priority to use
+ * @param priority maximum outgoing cumulative request priority to use
 * @param ttl current time-to-live for the request
 * @param sender_pid peer ID to use for the sender when forwarding, 0 for none
 * @param origin_pid peer ID of origin of query (do not loop back)
diff --git a/src/fs/gnunet-service-fs_put.c b/src/fs/gnunet-service-fs_put.c
index ddc15820a..93333b7a2 100644
--- a/src/fs/gnunet-service-fs_put.c
+++ b/src/fs/gnunet-service-fs_put.c
@@ -66,7 +66,7 @@ struct PutOperator
  struct GNUNET_SCHEDULER_Task *dht_task;
  /**
-   * How many entires with zero anonymity of our type do we currently
+   * How many entries with zero anonymity of our type do we currently
   * estimate to have in the database?
   */
  uint64_t zero_anonymity_count_estimate;
diff --git a/src/fs/test_fs_directory.c b/src/fs/test_fs_directory.c
index 1b109c4d4..908e7c555 100644
--- a/src/fs/test_fs_directory.c
+++ b/src/fs/test_fs_directory.c
@@ -139,7 +139,7 @@ testDirectory (unsigned int i)
                                                (start),
                                              GNUNET_YES);
  fprintf (stdout,
-           "Creating directory with %u entires and total size %llu took %s\n",
+           "Creating directory with %u entries and total size %llu took %s\n",
           i, (unsigned long long) dlen, s);
  if (i < 100)
  {
diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c
index 9d0978e06..22013db27 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -24,7 +24,7 @@
 * @author Christian Grothoff
 *
 * TODO:
- * - test that metatdata, etc. are all correct (for example,
+ * - test that metadata, etc. are all correct (for example,
 *   there is a known bug with dirname never being set that is
 *   not detected!)
 * - need to iterate over file-information structure
diff --git a/src/hello/hello.c b/src/hello/hello.c
index fa859a772..12b576ceb 100644
--- a/src/hello/hello.c
+++ b/src/hello/hello.c
@@ -709,7 +709,7 @@ struct EqualsContext
 {
  /**
   * Addresses that expired before this date are ignored for
-   * the comparisson.
+   * the comparison.
   */
  struct GNUNET_TIME_Absolute expiration_limit;
@@ -905,7 +905,7 @@ GNUNET_HELLO_get_last_expiration (const struct GNUNET_HELLO_Message *msg)
 /**
 * GNUnet URIs are of the general form "gnunet://MODULE/IDENTIFIER".
 * The specific structure of "IDENTIFIER" depends on the module and
- * maybe differenciated into additional subcategories if applicable.
+ * maybe differentiated into additional subcategories if applicable.
 * This module only deals with hello identifiers (MODULE = "hello").
 * <p>
 *
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c
index b377f2041..44966d3de 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
@@ -83,7 +83,7 @@
 #define HOSTLIST_SUCCESSFUL_DOWNLOAD 100
 /**
- * Value added for each valid HELLO recived during a hostlist download
+ * Value added for each valid HELLO received during a hostlist download
 */
 #define HOSTLIST_SUCCESSFUL_HELLO 1
@@ -111,7 +111,7 @@ struct Hostlist
  /**
   * Value describing the quality of the hostlist, the bigger the better but (should) never < 0
   * used for deciding which hostlist is replaced if MAX_NUMBER_HOSTLISTS in data structure is reached
-   * intial value = HOSTLIST_INITIAL
+   * initial value = HOSTLIST_INITIAL
   * increased every successful download by HOSTLIST_SUCCESSFULL_DOWNLOAD
   * increased every successful download by number of obtained HELLO messages
   * decreased every failed download by HOSTLIST_SUCCESSFULL_DOWNLOAD
@@ -119,7 +119,7 @@ struct Hostlist
  uint64_t quality;
  /**
-   * Time the hostlist advertisement was recieved and the entry was created
+   * Time the hostlist advertisement was received and the entry was created
   */
  struct GNUNET_TIME_Absolute time_creation;
@@ -211,7 +211,7 @@ static struct GNUNET_SCHEDULER_Task *ti_check_download;
 static struct GNUNET_SCHEDULER_Task *ti_download;
 /**
- * ID of the task saving the hostlsit in a regular intervall
+ * ID of the task saving the hostlsit in a regular interval
 */
 static struct GNUNET_SCHEDULER_Task *ti_saving_task;
@@ -246,7 +246,7 @@ static struct Hostlist *linked_list_tail;
 static struct Hostlist *current_hostlist;
 /**
- *  Size of the linke list  used to store hostlists
+ *  Size of the linked list  used to store hostlists
 */
 static unsigned int linked_list_size;
@@ -1098,7 +1098,7 @@ task_download_dispatcher (void *cls)
  else
  {
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Download in progess, have to wait...\n");
+                "Download in progress, have to wait...\n");
    ti_download_dispatcher_task =
      GNUNET_SCHEDULER_add_delayed (WAITING_INTERVAL,
                                    &task_download_dispatcher,
@@ -1160,7 +1160,7 @@ task_check (void *cls)
 /**
- * This tasks sets hostlist testing to allowed after intervall between to testings is reached
+ * This tasks sets hostlist testing to allowed after interval between to testings is reached
 *
 * @param cls closure
 */
@@ -1249,7 +1249,7 @@ handler_advertisement (const char *uri)
  uri_size = strlen (uri) + 1;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Hostlist client recieved advertisement containing URI `%s'\n",
+              "Hostlist client received advertisement containing URI `%s'\n",
              uri);
  if (GNUNET_NO != linked_list_contains (uri))
  {
@@ -1440,7 +1440,7 @@ load_hostlist_file ()
    GNUNET_CONTAINER_DLL_insert (linked_list_head, linked_list_tail, hostlist);
    linked_list_size++;
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Added hostlist entry eith URI `%s' \n",
+                "Added hostlist entry with URI `%s' \n",
                hostlist->hostlist_uri);
    GNUNET_free (uri);
    uri = NULL;
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c
index fb80f6331..46b18b266 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.c
+++ b/src/hostlist/gnunet-daemon-hostlist_server.c
@@ -36,7 +36,7 @@
 /**
- * How long until our hostlist advertisment transmission via CORE should
+ * How long until our hostlist advertisement transmission via CORE should
 * time out?
 */
 #define GNUNET_ADV_TIMEOUT \
@@ -127,7 +127,7 @@ struct HostSet
 /**
- * NULL if we are not currenlty iterating over peer information.
+ * NULL if we are not currently iterating over peer information.
 */
 static struct HostSet *builder;
@@ -184,7 +184,7 @@ finish_response ()
 * @param cls closure, an `int *`
 * @param address the address (ignored)
 * @param expiration expiration time (call is ignored if this is in the past)
- * @return  #GNUNET_SYSERR to stop iterating (unless expiration has occured)
+ * @return  #GNUNET_SYSERR to stop iterating (unless expiration has occurred)
 */
 static int
 check_has_addr (void *cls,
@@ -343,7 +343,7 @@ accept_policy_callback (void *cls,
 *        can be set with the #MHD_OPTION_NOTIFY_COMPLETED).
 *        Initially, `*con_cls` will be NULL.
 * @return #MHD_YES if the connection was handled successfully,
- *         #MHD_NO if the socket must be closed due to a serios
+ *         #MHD_NO if the socket must be closed due to a serious
 *         error while handling the request
 */
 static MHD_RESULT
diff --git a/src/include/gnunet_nt_lib.h b/src/include/gnunet_nt_lib.h
index 068c56302..18419a7b8 100644
--- a/src/include/gnunet_nt_lib.h
+++ b/src/include/gnunet_nt_lib.h
@@ -88,7 +88,7 @@ struct GNUNET_NT_InterfaceScanner;
 /**
- * Returns where the address is located: loopback, LAN or WANT.
+ * Returns where the address is located: loopback, LAN or WAN.
 *
 * @param is handle from #GNUNET_ATS_interface_scanner_init()
 * @param addr address
diff --git a/src/include/gnunet_transport_plugin.h b/src/include/gnunet_transport_plugin.h
index 3e6d1edc6..74b27923a 100644
--- a/src/include/gnunet_transport_plugin.h
+++ b/src/include/gnunet_transport_plugin.h
@@ -127,7 +127,7 @@ typedef struct GNUNET_TIME_Relative
 /**
 * Function that can be called by plugins to figure if an address is
- * an loopback, LAN or WANT address.   Ultimately invokes
+ * an loopback, LAN or WAN address.   Ultimately invokes
 * #GNUNET_ATS_address_get_type().
 *
 * @param cls closure
@@ -265,7 +265,7 @@ struct GNUNET_TRANSPORT_PluginEnvironment
  /**
   * Function that will be called to figure if an address is an loopback,
-   * LAN, WANT etc. address
+   * LAN, WAN etc. address
   */
  GNUNET_TRANSPORT_AddressToType get_address_type;
diff --git a/src/messenger/gnunet-messenger.c b/src/messenger/gnunet-messenger.c
index 094ae398d..094ae398d 100755..100644
--- a/src/messenger/gnunet-messenger.c
+++ b/src/messenger/gnunet-messenger.c
diff --git a/src/messenger/gnunet-service-messenger.c b/src/messenger/gnunet-service-messenger.c
index 7edd76d32..7edd76d32 100755..100644
--- a/src/messenger/gnunet-service-messenger.c
+++ b/src/messenger/gnunet-service-messenger.c
diff --git a/src/messenger/gnunet-service-messenger_member.c b/src/messenger/gnunet-service-messenger_member.c
index 7f00e8438..7f00e8438 100755..100644
--- a/src/messenger/gnunet-service-messenger_member.c
+++ b/src/messenger/gnunet-service-messenger_member.c
diff --git a/src/messenger/gnunet-service-messenger_message_store.c b/src/messenger/gnunet-service-messenger_message_store.c
index 1984eba21..1984eba21 100755..100644
--- a/src/messenger/gnunet-service-messenger_message_store.c
+++ b/src/messenger/gnunet-service-messenger_message_store.c
diff --git a/src/messenger/gnunet-service-messenger_operation_store.c b/src/messenger/gnunet-service-messenger_operation_store.c
index a32fbad2c..a32fbad2c 100755..100644
--- a/src/messenger/gnunet-service-messenger_operation_store.c
+++ b/src/messenger/gnunet-service-messenger_operation_store.c
diff --git a/src/messenger/messenger_api_contact_store.c b/src/messenger/messenger_api_contact_store.c
index 6a517c2e0..6a517c2e0 100755..100644
--- a/src/messenger/messenger_api_contact_store.c
+++ b/src/messenger/messenger_api_contact_store.c
diff --git a/src/messenger/messenger_api_message.c b/src/messenger/messenger_api_message.c
index d65b80576..d65b80576 100755..100644
--- a/src/messenger/messenger_api_message.c
+++ b/src/messenger/messenger_api_message.c
diff --git a/src/messenger/messenger_api_room.c b/src/messenger/messenger_api_room.c
index 5b7edee60..5b7edee60 100755..100644
--- a/src/messenger/messenger_api_room.c
+++ b/src/messenger/messenger_api_room.c
diff --git a/src/messenger/messenger_api_room.h b/src/messenger/messenger_api_room.h
index eb41cf740..eb41cf740 100755..100644
--- a/src/messenger/messenger_api_room.h
+++ b/src/messenger/messenger_api_room.h
diff --git a/src/my/my.c b/src/my/my.c
index 256f71742..468a4a47c 100644
--- a/src/my/my.c
+++ b/src/my/my.c
@@ -32,7 +32,7 @@
 * Run a prepared SELECT statement.
 *
 * @param mc mysql context
- * @param sh handle to SELECT statment
+ * @param sh handle to SELECT statement
 * @param params parameters to the statement
 * @return
 #GNUNET_YES if we can prepare all statement
diff --git a/src/my/my_result_helper.c b/src/my/my_result_helper.c
index 78f1a1ec0..99b4229a4 100644
--- a/src/my/my_result_helper.c
+++ b/src/my/my_result_helper.c
@@ -663,7 +663,7 @@ pre_extract_uint16 (void *cls,
 /**
- * Check size of extracted fixed size data from a Mysql datbase.
+ * Check size of extracted fixed size data from a Mysql database.
 *
 * @param cls closure
 * @param[in,out] rs
@@ -712,7 +712,7 @@ GNUNET_MY_result_spec_uint16 (uint16_t *u16)
 /**
- * Extrac data from a  MYSQL database @a result at row @a row
+ * Extract data from a  MYSQL database @a result at row @a row
 *
 * @param cls closure
 * @param cls closure
@@ -743,7 +743,7 @@ pre_extract_uint32 (void *cls,
 /**
- * Extrac data from a  MYSQL database @a result at row @a row
+ * Extract data from a  MYSQL database @a result at row @a row
 *
 * @param cls closure
 * @param cls closure
@@ -825,7 +825,7 @@ pre_extract_uint64 (void *cls,
 /**
- * Check size of extracted fixe size data from a Mysql database
+ * Check size of extracted fixed-size data from a Mysql database
 *
 * @param cls closure
 * @param[in,out] rs
diff --git a/src/my/test_my.c b/src/my/test_my.c
index c639fcfdd..ffb5a5f13 100644
--- a/src/my/test_my.c
+++ b/src/my/test_my.c
@@ -33,7 +33,7 @@
 * Run actual test queries.
 *
 * @param contexte the current context of mysql
- * @return 0 on succes
+ * @return 0 on success
 */
 static int
 run_queries (struct GNUNET_MYSQL_Context *context)
@@ -252,7 +252,7 @@ main (int argc, const char *const argv[])
  if (GNUNET_OK !=
      GNUNET_CONFIGURATION_parse (config, "test_my.conf"))
  {
-    fprintf (stderr, "Failed to parse configuaration\n");
+    fprintf (stderr, "Failed to parse configuration\n");
    return 1;
  }
diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c
index e20debc82..738659864 100644
--- a/src/mysql/mysql.c
+++ b/src/mysql/mysql.c
@@ -209,7 +209,7 @@ get_my_cnf_path (const struct GNUNET_CONFIGURATION_Handle *cfg,
 * Open the connection with the database (and initialize
 * our default options).
 *
- * @param mc database context to initialze
+ * @param mc database context to initialize
 * @return #GNUNET_OK on success
 */
 static int
diff --git a/src/namestore/gnunet-namestore-fcfsd.c b/src/namestore/gnunet-namestore-fcfsd.c
index 6d794746e..313aea6fc 100644
--- a/src/namestore/gnunet-namestore-fcfsd.c
+++ b/src/namestore/gnunet-namestore-fcfsd.c
@@ -194,7 +194,7 @@ struct ZoneinfoRequest
 };
 /**
- * MHD deamon reference.
+ * MHD daemon reference.
 */
 static struct MHD_Daemon *httpd;
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index 79210939f..cd953492e 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -88,13 +88,13 @@ struct ZoneIteration
   * Last sequence number in the zone iteration used to address next
   * result of the zone iteration in the store
   *
-   * Initialy set to 0.
+   * Initially set to 0.
   * Updated in #zone_iterate_proc()
   */
  uint64_t seq;
  /**
-   * The operation id fot the zone iteration in the response for the client
+   * The operation id for the zone iteration in the response for the client
   */
  uint32_t request_id;
@@ -102,7 +102,7 @@ struct ZoneIteration
   * Offset of the zone iteration used to address next result of the zone
   * iteration in the store
   *
-   * Initialy set to 0 in #handle_iteration_start
+   * Initially set to 0 in #handle_iteration_start
   * Incremented with by every call to #handle_iteration_next
   */
  uint32_t offset;
@@ -195,7 +195,7 @@ struct ZoneMonitor
   * Last sequence number in the zone iteration used to address next
   * result of the zone iteration in the store
   *
-   * Initialy set to 0.
+   * Initially set to 0.
   * Updated in #monitor_iterate_cb()
   */
  uint64_t seq;
@@ -1821,7 +1821,8 @@ run_zone_iteration_round (struct ZoneIteration *zi, uint64_t limit)
  start = GNUNET_TIME_absolute_get ();
  GNUNET_break (GNUNET_SYSERR !=
                GSN_database->iterate_records (GSN_database->cls,
-                                               (GNUNET_YES == GNUNET_is_zero (&zi->zone))
+                                               (GNUNET_YES == GNUNET_is_zero (
+                                                  &zi->zone))
                                               ? NULL
                                               : &zi->zone,
                                               zi->seq,
@@ -2095,7 +2096,8 @@ monitor_iteration_next (void *cls)
  else
    zm->iteration_cnt = zm->limit; /* use it all */
  ret = GSN_database->iterate_records (GSN_database->cls,
-                                       (GNUNET_YES == GNUNET_is_zero (&zm->zone))
+                                       (GNUNET_YES == GNUNET_is_zero (
+                                          &zm->zone))
                                       ? NULL
                                       : &zm->zone,
                                       zm->seq,
diff --git a/src/namestore/namestore_api.c b/src/namestore/namestore_api.c
index 2d5327e06..b24db9b26 100644
--- a/src/namestore/namestore_api.c
+++ b/src/namestore/namestore_api.c
@@ -324,7 +324,7 @@ free_ze (struct GNUNET_NAMESTORE_ZoneIterator *ze)
 /**
- * Check that @a rd_buf of lenght @a rd_len contains
+ * Check that @a rd_buf of length @a rd_len contains
 * @a rd_count records.
 *
 * @param rd_len length of @a rd_buf
@@ -557,7 +557,7 @@ handle_record_result (void *cls, const struct RecordResultMessage *msg)
    return; /* rid not found */
  if ((NULL != ze) && (NULL != qe))
  {
-    GNUNET_break (0);  /* rid ambigous */
+    GNUNET_break (0);  /* rid ambiguous */
    force_reconnect (h);
    return;
  }
@@ -614,7 +614,7 @@ handle_record_result_end (void *cls, const struct GNUNET_NAMESTORE_Header *msg)
    return; /* rid not found */
  if ((NULL != ze) && (NULL != qe))
  {
-    GNUNET_break (0);  /* rid ambigous */
+    GNUNET_break (0);  /* rid ambiguous */
    force_reconnect (h);
    return;
  }
diff --git a/src/namestore/perf_namestore_api_zone_iteration.c b/src/namestore/perf_namestore_api_zone_iteration.c
index f46a1c523..ce1cddf87 100644
--- a/src/namestore/perf_namestore_api_zone_iteration.c
+++ b/src/namestore/perf_namestore_api_zone_iteration.c
@@ -248,7 +248,7 @@ zone_proc (void *cls,
  off++;
  left_until_next--;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Obtained record %u, expecting %u more until asking for mor explicitly\n",
+              "Obtained record %u, expecting %u more until asking for more explicitly\n",
              off,
              left_until_next);
  if (0 == left_until_next)
diff --git a/src/namestore/plugin_namestore_flat.c b/src/namestore/plugin_namestore_flat.c
index 9ccc90cfd..3576b14e0 100644
--- a/src/namestore/plugin_namestore_flat.c
+++ b/src/namestore/plugin_namestore_flat.c
@@ -57,7 +57,7 @@ struct FlatFileEntry
  struct GNUNET_IDENTITY_PrivateKey private_key;
  /**
-   * Record cound
+   * Record count.
   */
  uint32_t record_count;
diff --git a/src/nat-auto/gnunet-nat-auto.c b/src/nat-auto/gnunet-nat-auto.c
index 95a7ced9e..055a949bd 100644
--- a/src/nat-auto/gnunet-nat-auto.c
+++ b/src/nat-auto/gnunet-nat-auto.c
@@ -101,7 +101,7 @@ test_finished ()
 /**
- * Function to iterate over sugested changes options
+ * Function to iterate over suggested changes options
 *
 * @param cls closure
 * @param section name of the section
diff --git a/src/nat-auto/gnunet-nat-auto_legacy.c b/src/nat-auto/gnunet-nat-auto_legacy.c
index 8ba50c184..4334cc953 100644
--- a/src/nat-auto/gnunet-nat-auto_legacy.c
+++ b/src/nat-auto/gnunet-nat-auto_legacy.c
@@ -180,7 +180,7 @@ struct GNUNET_NAT_Test
 *
 * @param cls closure, our `struct GNUNET_NAT_Handle`
 * @param addr public IP address of the other peer
- * @param addrlen actual lenght of the @a addr
+ * @param addrlen actual length of the @a addr
 */
 static void
 reversal_cb (void *cls, const struct sockaddr *addr, socklen_t addrlen)
diff --git a/src/nat-auto/gnunet-nat-server.c b/src/nat-auto/gnunet-nat-server.c
index b462b486f..e091ab3b0 100644
--- a/src/nat-auto/gnunet-nat-server.c
+++ b/src/nat-auto/gnunet-nat-server.c
@@ -54,7 +54,7 @@ static const struct GNUNET_CONFIGURATION_Handle *cfg;
 /**
- * Try contacting the peer using autonomous NAT traveral method.
+ * Try contacting the peer using autonomous NAT traversal method.
 *
 * @param dst_ipv4 IPv4 address to send the fake ICMP message
 * @param dport destination port to include in ICMP message
diff --git a/src/nat-auto/nat_auto_api_test.c b/src/nat-auto/nat_auto_api_test.c
index ec7557cd0..b62d08683 100644
--- a/src/nat-auto/nat_auto_api_test.c
+++ b/src/nat-auto/nat_auto_api_test.c
@@ -180,7 +180,7 @@ struct GNUNET_NAT_AUTO_Test
 *
 * @param cls closure, our `struct GNUNET_NAT_Handle`
 * @param addr public IP address of the other peer
- * @param addrlen actual lenght of the @a addr
+ * @param addrlen actual length of the @a addr
 */
 static void
 reversal_cb (void *cls, const struct sockaddr *addr, socklen_t addrlen)
diff --git a/src/nat/nat_api.c b/src/nat/nat_api.c
index c1125dc75..4622b1428 100644
--- a/src/nat/nat_api.c
+++ b/src/nat/nat_api.c
@@ -368,7 +368,7 @@ do_connect (void *cls)
 * @param num_addrs number of addresses in @a addrs
 * @param addrs list of local addresses packets should be redirected to
 * @param addrlens actual lengths of the addresses in @a addrs
- * @param address_callback function to call everytime the public IP address changes
+ * @param address_callback function to call every time the public IP address changes
 * @param reversal_callback function to call if someone wants connection reversal from us,
 *        NULL if connection reversal is not supported
 * @param callback_cls closure for callbacks
diff --git a/src/nat/nat_api_stun.c b/src/nat/nat_api_stun.c
index 461dae1f5..0bc2c5fbd 100644
--- a/src/nat/nat_api_stun.c
+++ b/src/nat/nat_api_stun.c
@@ -71,7 +71,7 @@ struct GNUNET_NAT_STUN_Handle
  char *stun_server;
  /**
-   * Function to call when a error occours
+   * Function to call when a error occurs
   */
  GNUNET_NAT_TestCallback cb;
diff --git a/src/nat/test_nat_mini.c b/src/nat/test_nat_mini.c
index 8cbd4131d..528815e1a 100644
--- a/src/nat/test_nat_mini.c
+++ b/src/nat/test_nat_mini.c
@@ -17,14 +17,14 @@
     SPDX-License-Identifier: AGPL3.0-or-later
 */
 /**
- * Testcase for port redirection and public IP address retrieval.
- * This test never fails, because there need to be a NAT box set up for tha *
 * @file nat/test_nat_mini.c
 * @brief Testcase for NAT library - mini
 * @author Christian Grothoff
 *
+ * Testcase for port redirection and public IP address retrieval.
+ * This test never fails, because there need to be a NAT box set up for that
+ *
 * TODO: actually use ARM to start resolver service to make DNS work!
 */
diff --git a/src/peerinfo-tool/plugin_rest_peerinfo.c b/src/peerinfo-tool/plugin_rest_peerinfo.c
index f969a175b..13e2e863b 100644
--- a/src/peerinfo-tool/plugin_rest_peerinfo.c
+++ b/src/peerinfo-tool/plugin_rest_peerinfo.c
@@ -256,7 +256,7 @@ struct RequestHandle
  char *emsg;
  /**
-   * Reponse code
+   * Response code
   */
  int response_code;
 };
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index 196d44faa..502b38646 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -377,7 +377,7 @@ rewatch_it (void *cls, const struct GNUNET_HashCode *key, void *value)
 /**
 * Iterator over watch requests to cancel them.
 *
- * @param cls unsused
+ * @param cls unused
 * @param key key to the watch request
 * @param value watch context
 * @return #GNUNET_YES to continue iteration
@@ -534,7 +534,7 @@ GNUNET_PEERSTORE_store (struct GNUNET_PEERSTORE_Handle *h,
  struct GNUNET_PEERSTORE_StoreContext *sc;
  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Storing value (size: %lu) for subsytem `%s', peer `%s', key `%s'\n",
+       "Storing value (size: %lu) for subsystem `%s', peer `%s', key `%s'\n",
       size,
       sub_system,
       GNUNET_i2s (peer),
diff --git a/src/pt/gnunet-daemon-pt.c b/src/pt/gnunet-daemon-pt.c
index bcc913bd2..da4374223 100644
--- a/src/pt/gnunet-daemon-pt.c
+++ b/src/pt/gnunet-daemon-pt.c
@@ -138,7 +138,7 @@ struct CadetExit
  /**
   * Channel we use for DNS requests over CADET, NULL if we did
-   * not initialze a channel to this peer yet.
+   * not initialize a channel to this peer yet.
   */
  struct GNUNET_CADET_Channel *cadet_channel;
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index e20d835f8..d2d28d7c7 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -144,7 +144,7 @@ mhd_ahc (void *cls,
  }
  *unused = NULL;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "MHD sends respose for request to URL `%s'\n", url);
+              "MHD sends response for request to URL `%s'\n", url);
  response = MHD_create_response_from_buffer (strlen (url),
                                              (void *) url,
                                              MHD_RESPMEM_MUST_COPY);
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c
index 8ffadeca4..ab197b60d 100644
--- a/src/pt/test_gnunet_vpn.c
+++ b/src/pt/test_gnunet_vpn.c
@@ -120,7 +120,7 @@ mhd_ahc (void *cls,
  }
  *unused = NULL;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "MHD sends respose for request to URL `%s'\n", url);
+              "MHD sends response for request to URL `%s'\n", url);
  response =
    MHD_create_response_from_buffer (strlen (url), (void *) url,
                                     MHD_RESPMEM_MUST_COPY);
diff --git a/src/reclaim/gnunet-service-reclaim.c b/src/reclaim/gnunet-service-reclaim.c
index 04c12735b..105187c26 100644
--- a/src/reclaim/gnunet-service-reclaim.c
+++ b/src/reclaim/gnunet-service-reclaim.c
@@ -1824,7 +1824,7 @@ handle_credential_delete_message (void *cls,
 /*************************************************
- * Attrubute iteration
+ * Attribute iteration
 *************************************************/
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c
index 48b3fe214..5d3119c6f 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/reclaim/gnunet-service-reclaim_tickets.c
@@ -29,7 +29,7 @@
 /**
- * FIXME: the defaul ticket iteration interval should probably
+ * FIXME: the default ticket iteration interval should probably
 * be the minimim attribute expiration.
 */
 #define DEFAULT_TICKET_REFRESH_INTERVAL GNUNET_TIME_UNIT_HOURS
@@ -129,7 +129,7 @@ struct RECLAIM_TICKETS_ConsumeHandle
  RECLAIM_TICKETS_ConsumeCallback cb;
  /**
-   * Callbacl closure
+   * Callback closure
   */
  void *cb_cls;
 };
@@ -1319,31 +1319,32 @@ issue_ticket (struct TicketIssueHandle *ih)
    {
      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                  "Attribute is backed by credential. Adding...\n");
-      struct GNUNET_RECLAIM_Presentation *pres = NULL;
+      struct GNUNET_RECLAIM_Presentation *presentation = NULL;
      for (j = 0; j < i; j++)
      {
        if (attrs_record[j].record_type
            != GNUNET_GNSRECORD_TYPE_RECLAIM_PRESENTATION)
          continue;
-        pres = GNUNET_RECLAIM_presentation_deserialize (attrs_record[j].data,
+        presentation = GNUNET_RECLAIM_presentation_deserialize (
-                                                        attrs_record[j].
+          attrs_record[j].data,
-                                                        data_size);
+          attrs_record[j].
-        if (NULL == pres)
+          data_size);
+        if (NULL == presentation)
        {
          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                      "Failed to deserialize presentation\n");
          continue;
        }
-        if (0 == memcmp (&pres->credential_id,
+        if (0 == memcmp (&presentation->credential_id,
                         &le->attribute->credential,
                         sizeof (le->attribute->credential)))
          break;
-        GNUNET_free (pres);
+        GNUNET_free (presentation);
-        pres = NULL;
+        presentation = NULL;
      }
-      if (NULL != pres)
+      if (NULL != presentation)
      {
-        GNUNET_free (pres);
+        GNUNET_free (presentation);
        continue; // Skip as we have already added this credential presentation.
      }
      for (ple = ih->presentations->list_head; NULL != ple; ple = ple->next)
@@ -1361,6 +1362,7 @@ issue_ticket (struct TicketIssueHandle *ih)
        }
        char *pres_buf;
        size_t pres_size;
        pres_size =
          GNUNET_RECLAIM_presentation_serialize_get_size (ple->presentation);
        pres_buf = GNUNET_malloc (pres_size);
@@ -1457,7 +1459,7 @@ filter_tickets_cb (void *cls,
 {
  struct TicketIssueHandle *tih = cls;
  struct GNUNET_RECLAIM_Ticket *ticket = NULL;
-  struct GNUNET_RECLAIM_Presentation *pres;
+  struct GNUNET_RECLAIM_Presentation *presentation;
  struct GNUNET_RECLAIM_PresentationList *ticket_presentations;
  struct GNUNET_RECLAIM_Credential *cred;
  struct GNUNET_RECLAIM_PresentationListEntry *ple;
@@ -1526,7 +1528,7 @@ filter_tickets_cb (void *cls,
        if (GNUNET_OK != GNUNET_RECLAIM_credential_get_presentation (
              cred,
              tih->attrs,
-              &pres))
+              &presentation))
        {
          GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                      "Unable to retrieve presentation from credential\n");
@@ -1534,7 +1536,7 @@ filter_tickets_cb (void *cls,
          continue;
        }
        ple = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-        ple->presentation = pres;
+        ple->presentation = presentation;
        GNUNET_CONTAINER_DLL_insert (tih->presentations->list_head,
                                     tih->presentations->list_tail,
                                     ple);
@@ -1546,20 +1548,21 @@ filter_tickets_cb (void *cls,
    {
      for (le = tih->attrs->list_head; NULL != le; le = le->next)
      {
-        pres = GNUNET_RECLAIM_presentation_deserialize (rd[i].data,
+        presentation = GNUNET_RECLAIM_presentation_deserialize (rd[i].data,
-                                                        rd[i].data_size);
+                                                                rd[i].data_size);
-        if (NULL == pres)
+        if (NULL == presentation)
        {
          GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                      "Failed to deserialize presentation\n");
          continue;
        }
-        if (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (&pres->credential_id,
+        if (GNUNET_YES == GNUNET_RECLAIM_id_is_equal (
-                                                      &le->attribute->credential))
+              &presentation->credential_id,
+              &le->attribute->credential))
        {
          found_pres_cnt++;
          ple = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-          ple->presentation = pres;
+          ple->presentation = presentation;
          GNUNET_CONTAINER_DLL_insert (ticket_presentations->list_head,
                                       ticket_presentations->list_tail,
                                       ple);
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c
index 7b24ee598..9237902ce 100644
--- a/src/reclaim/oidc_helper.c
+++ b/src/reclaim/oidc_helper.c
@@ -237,7 +237,7 @@ generate_userinfo_json (const struct GNUNET_IDENTITY_PublicKey *sub_key,
                                                  le->attribute->data,
                                                  le->attribute->data_size);
      /**
-       * There is this wierd quirk that the individual address claim(s) must be
+       * There is this weird quirk that the individual address claim(s) must be
       * inside a JSON object of the "address" claim.
       */
      if (GNUNET_YES == is_claim_in_address_scope (le->attribute->name))
@@ -287,7 +287,7 @@ generate_userinfo_json (const struct GNUNET_IDENTITY_PublicKey *sub_key,
        continue;
      }
      /**
-       * There is this wierd quirk that the individual address claim(s) must be
+       * There is this weird quirk that the individual address claim(s) must be
       * inside a JSON object of the "address" claim.
       */
      if (GNUNET_YES == is_claim_in_address_scope (le->attribute->name))
diff --git a/src/reclaim/plugin_reclaim_credential_jwt.c b/src/reclaim/plugin_reclaim_credential_jwt.c
index fb01903aa..5d5e221f9 100644
--- a/src/reclaim/plugin_reclaim_credential_jwt.c
+++ b/src/reclaim/plugin_reclaim_credential_jwt.c
@@ -194,7 +194,8 @@ jwt_parse_attributes (void *cls,
      continue;
    if (0 == strcmp ("address", key))
    {
-      if (!json_is_object(value)) {
+      if (! json_is_object (value))
+      {
        GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                    "address claim in wrong format!");
        continue;
@@ -202,12 +203,12 @@ jwt_parse_attributes (void *cls,
      json_object_foreach (value, addr_key, addr_value) {
        val_str = json_dumps (addr_value, JSON_ENCODE_ANY);
        tmp = val_str;
-        //Remove leading " from jasson conversion
+        // Remove leading " from jasson conversion
        if (tmp[0] == '"')
          tmp++;
-        //Remove trailing " from jansson conversion
+        // Remove trailing " from jansson conversion
-        if (tmp[strlen(tmp)-1] == '"')
+        if (tmp[strlen (tmp) - 1] == '"')
-          tmp[strlen(tmp)-1] = '\0';
+          tmp[strlen (tmp) - 1] = '\0';
        GNUNET_RECLAIM_attribute_list_add (attrs,
                                           addr_key,
                                           NULL,
@@ -220,12 +221,12 @@ jwt_parse_attributes (void *cls,
    }
    val_str = json_dumps (value, JSON_ENCODE_ANY);
    tmp = val_str;
-    //Remove leading " from jasson conversion
+    // Remove leading " from jasson conversion
    if (tmp[0] == '"')
      tmp++;
-    //Remove trailing " from jansson conversion
+    // Remove trailing " from jansson conversion
-    if (tmp[strlen(tmp)-1] == '"')
+    if (tmp[strlen (tmp) - 1] == '"')
-      tmp[strlen(tmp)-1] = '\0';
+      tmp[strlen (tmp) - 1] = '\0';
    GNUNET_RECLAIM_attribute_list_add (attrs,
                                       key,
                                       NULL,
@@ -307,7 +308,8 @@ jwt_get_issuer (void *cls,
  if (NULL == json_val)
    return NULL;
  issuer_json = json_object_get (json_val, "iss");
-  if ((NULL == issuer_json) || (! json_is_string (issuer_json))) {
+  if ((NULL == issuer_json) || (! json_is_string (issuer_json)))
+  {
    json_decref (json_val);
    return NULL;
  }
@@ -384,7 +386,8 @@ jwt_get_expiration (void *cls,
  if (NULL == json_val)
    return GNUNET_SYSERR;
  exp_json = json_object_get (json_val, "exp");
-  if ((NULL == exp_json) || (! json_is_integer (exp_json))) {
+  if ((NULL == exp_json) || (! json_is_integer (exp_json)))
+  {
    json_decref (json_val);
    return GNUNET_SYSERR;
  }
@@ -434,13 +437,14 @@ enum GNUNET_GenericReturnValue
 jwt_create_presentation (void *cls,
                         const struct GNUNET_RECLAIM_Credential *cred,
                         const struct GNUNET_RECLAIM_AttributeList *attrs,
-                         struct GNUNET_RECLAIM_Presentation **pres)
+                         struct GNUNET_RECLAIM_Presentation **presentation)
 {
  if (GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT != cred->type)
    return GNUNET_NO;
-  *pres = GNUNET_RECLAIM_presentation_new (GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT,
+  *presentation = GNUNET_RECLAIM_presentation_new (
-                                           cred->data,
+    GNUNET_RECLAIM_CREDENTIAL_TYPE_JWT,
-                                           cred->data_size);
+    cred->data,
+    cred->data_size);
  return GNUNET_OK;
 }
diff --git a/src/reclaim/plugin_reclaim_credential_pabc.c b/src/reclaim/plugin_reclaim_credential_pabc.c
index 89acd9032..a906805fb 100644
--- a/src/reclaim/plugin_reclaim_credential_pabc.c
+++ b/src/reclaim/plugin_reclaim_credential_pabc.c
@@ -154,7 +154,7 @@ inspect_attrs (char const *const key,
  if (NULL == value)
    return;
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "Found attribue in PABC credential: `%s': `%s'\n",
+              "Found attribute in PABC credential: `%s': `%s'\n",
              key, value);
  if (0 == strcmp (key, "expiration"))
    return;
@@ -362,7 +362,7 @@ int
 pabc_create_presentation (void *cls,
                          const struct GNUNET_RECLAIM_Credential *credential,
                          const struct GNUNET_RECLAIM_AttributeList *attrs,
-                          struct GNUNET_RECLAIM_Presentation **pres)
+                          struct GNUNET_RECLAIM_Presentation **presentation)
 {
  struct pabc_context *ctx = NULL;
  struct pabc_user_context *usr_ctx = NULL;
@@ -508,9 +508,10 @@ pabc_create_presentation (void *cls,
  GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
              "Presentation: %s\n", json_enc);
  // clean up
-  *pres = GNUNET_RECLAIM_presentation_new (GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC,
+  *presentation = GNUNET_RECLAIM_presentation_new (
-                                           json_enc,
+    GNUNET_RECLAIM_CREDENTIAL_TYPE_PABC,
-                                           strlen (json_enc) + 1);
+    json_enc,
+    strlen (json_enc) + 1);
  GNUNET_free (json_enc);
  PABC_FREE_NULL (json);
  pabc_free_proof (ctx, pp, &proof);
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c
index fef79fb10..88b928526 100644
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ b/src/reclaim/plugin_rest_openid_connect.c
@@ -551,7 +551,7 @@ struct RequestHandle
  char *edesc;
  /**
-   * Reponse code
+   * Response code
   */
  int response_code;
@@ -974,7 +974,8 @@ oidc_iteration_error (void *cls)
 static void
 oidc_ticket_issue_cb (void *cls,
                      const struct GNUNET_RECLAIM_Ticket *ticket,
-                      const struct GNUNET_RECLAIM_PresentationList *pres)
+                      const struct
+                      GNUNET_RECLAIM_PresentationList *presentation)
 {
  struct RequestHandle *handle = cls;
  struct MHD_Response *resp;
@@ -997,7 +998,7 @@ oidc_ticket_issue_cb (void *cls,
  code_string = OIDC_build_authz_code (&handle->priv_key,
                                       &handle->ticket,
                                       handle->attr_idtoken_list,
-                                       pres,
+                                       presentation,
                                       handle->oidc->nonce,
                                       handle->oidc->code_challenge);
  if ((NULL != handle->redirect_prefix) && (NULL != handle->redirect_suffix) &&
@@ -1103,7 +1104,7 @@ oidc_cred_collect_finished_cb (void *cls)
                                      handle->attr_userinfo_list);
  for (le_m = merged_list->list_head; NULL != le_m; le_m = le_m->next)
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "List Attibute in ticket to issue: %s\n",
+                "List Attribute in ticket to issue: %s\n",
                le_m->attribute->name);
  handle->idp_op = GNUNET_RECLAIM_ticket_issue (idp,
                                                &handle->priv_key,
@@ -1387,7 +1388,8 @@ build_redirect (void *cls)
    }
    resp = GNUNET_REST_create_response ("");
    GNUNET_assert (MHD_NO != MHD_add_response_header (resp,
-                                                      "Location", redirect_uri));
+                                                      "Location",
+                                                      redirect_uri));
    handle->proc (handle->proc_cls, resp, MHD_HTTP_FOUND);
    cleanup_handle (handle);
    GNUNET_free (redirect_uri);
@@ -2192,7 +2194,7 @@ token_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
                                     &cache_key,
                                     code,
                                     GNUNET_CONTAINER_MULTIHASHMAPOPTION_REPLACE);
-  /* If there was a previus code in there, free the old value */
+  /* If there was a previous code in there, free the old value */
  if (NULL != tmp_at)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
@@ -2231,7 +2233,7 @@ static void
 consume_ticket (void *cls,
                const struct GNUNET_IDENTITY_PublicKey *identity,
                const struct GNUNET_RECLAIM_Attribute *attr,
-                const struct GNUNET_RECLAIM_Presentation *pres)
+                const struct GNUNET_RECLAIM_Presentation *presentation)
 {
  struct RequestHandle *handle = cls;
  struct GNUNET_RECLAIM_AttributeListEntry *ale;
@@ -2268,14 +2270,14 @@ consume_ticket (void *cls,
  GNUNET_CONTAINER_DLL_insert (handle->attr_userinfo_list->list_head,
                               handle->attr_userinfo_list->list_tail,
                               ale);
-  if (NULL == pres)
+  if (NULL == presentation)
    return;
  for (atle = handle->presentations->list_head;
       NULL != atle; atle = atle->next)
  {
    if (GNUNET_NO == GNUNET_RECLAIM_id_is_equal (
          &atle->presentation->credential_id,
-          &pres->credential_id))
+          &presentation->credential_id))
      continue;
    break; /** already in list **/
  }
@@ -2283,10 +2285,11 @@ consume_ticket (void *cls,
  {
    /** Credential matches for attribute, add **/
    atle = GNUNET_new (struct GNUNET_RECLAIM_PresentationListEntry);
-    atle->presentation = GNUNET_RECLAIM_presentation_new (pres->type,
+    atle->presentation = GNUNET_RECLAIM_presentation_new (presentation->type,
-                                                          pres->data,
+                                                          presentation->data,
-                                                          pres->data_size);
+                                                          presentation->
-    atle->presentation->credential_id = pres->credential_id;
+                                                          data_size);
+    atle->presentation->credential_id = presentation->credential_id;
    GNUNET_CONTAINER_DLL_insert (handle->presentations->list_head,
                                 handle->presentations->list_tail,
                                 atle);
@@ -2643,7 +2646,7 @@ oidc_config_endpoint (struct GNUNET_REST_RequestHandle *con_handle,
                       response_types);
  sub_types = json_array ();
  json_array_append_new (sub_types,
-                         json_string ("public"));  /* no pairwise suppport */
+                         json_string ("public"));  /* no pairwise support */
  json_object_set_new (oidc_config,
                       "subject_types_supported",
                       sub_types);
diff --git a/src/reclaim/plugin_rest_pabc.c b/src/reclaim/plugin_rest_pabc.c
index 6603fb888..a0551f215 100644
--- a/src/reclaim/plugin_rest_pabc.c
+++ b/src/reclaim/plugin_rest_pabc.c
@@ -112,7 +112,7 @@ struct RequestHandle
  char *emsg;
  /**
-   * Reponse code
+   * Response code
   */
  int response_code;
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c
index 1d1231cbd..80d6ca976 100644
--- a/src/reclaim/plugin_rest_reclaim.c
+++ b/src/reclaim/plugin_rest_reclaim.c
@@ -245,7 +245,7 @@ struct RequestHandle
  char *emsg;
  /**
-   * Reponse code
+   * Response code
   */
  int response_code;
@@ -1200,7 +1200,7 @@ static void
 consume_cont (void *cls,
              const struct GNUNET_IDENTITY_PublicKey *identity,
              const struct GNUNET_RECLAIM_Attribute *attr,
-              const struct GNUNET_RECLAIM_Presentation *pres)
+              const struct GNUNET_RECLAIM_Presentation *presentation)
 {
  struct RequestHandle *handle = cls;
  char *val_str;
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c
index c08cc868c..f41473f9f 100644
--- a/src/reclaim/reclaim_api.c
+++ b/src/reclaim/reclaim_api.c
@@ -907,7 +907,7 @@ handle_ticket_result (void *cls, const struct TicketResultMessage *msg)
  struct GNUNET_RECLAIM_Handle *handle = cls;
  struct GNUNET_RECLAIM_Operation *op;
  struct GNUNET_RECLAIM_TicketIterator *it;
-  struct GNUNET_RECLAIM_PresentationList *pres;
+  struct GNUNET_RECLAIM_PresentationList *presentation;
  uint32_t r_id = ntohl (msg->id);
  static const struct GNUNET_RECLAIM_Ticket ticket;
  uint32_t pres_len = ntohs (msg->presentations_len);
@@ -923,8 +923,9 @@ handle_ticket_result (void *cls, const struct TicketResultMessage *msg)
  if (NULL != op)
  {
    if (0 < pres_len)
-      pres = GNUNET_RECLAIM_presentation_list_deserialize ((char*) &msg[1],
+      presentation = GNUNET_RECLAIM_presentation_list_deserialize (
-                                                           pres_len);
+        (char*) &msg[1],
+        pres_len);
    GNUNET_CONTAINER_DLL_remove (handle->op_head, handle->op_tail, op);
    if (0 ==
        memcmp (&msg->ticket, &ticket, sizeof(struct GNUNET_RECLAIM_Ticket)))
@@ -937,10 +938,10 @@ handle_ticket_result (void *cls, const struct TicketResultMessage *msg)
      if (NULL != op->ti_cb)
        op->ti_cb (op->cls,
                   &msg->ticket,
-                   (0 < pres_len) ? pres : NULL);
+                   (0 < pres_len) ? presentation : NULL);
    }
    if (0 < pres_len)
-      GNUNET_RECLAIM_presentation_list_destroy (pres);
+      GNUNET_RECLAIM_presentation_list_destroy (presentation);
    free_op (op);
    return;
  }
diff --git a/src/reclaim/reclaim_credential.c b/src/reclaim/reclaim_credential.c
index da5cee988..b4aeedf29 100644
--- a/src/reclaim/reclaim_credential.c
+++ b/src/reclaim/reclaim_credential.c
@@ -135,7 +135,6 @@ RECLAIM_CREDENTIAL_fini ()
 }
 /**
 * Convert an credential type name to the corresponding number
 *
@@ -1030,6 +1029,7 @@ GNUNET_RECLAIM_presentation_get_expiration (const struct
  return GNUNET_SYSERR;
 }
 /**
 * Create a presentation from a credential and a lift of (selected)
 * attributes in the credential.
@@ -1042,9 +1042,9 @@ GNUNET_RECLAIM_presentation_get_expiration (const struct
 */
 int
 GNUNET_RECLAIM_credential_get_presentation (
-                              const struct GNUNET_RECLAIM_Credential *cred,
+  const struct GNUNET_RECLAIM_Credential *cred,
-                              const struct GNUNET_RECLAIM_AttributeList *attrs,
+  const struct GNUNET_RECLAIM_AttributeList *attrs,
-                              struct GNUNET_RECLAIM_Presentation **pres)
+  struct GNUNET_RECLAIM_Presentation **presentation)
 {
  unsigned int i;
  struct Plugin *plugin;
@@ -1055,13 +1055,10 @@ GNUNET_RECLAIM_credential_get_presentation (
    if (GNUNET_OK !=  plugin->api->create_presentation (plugin->api->cls,
                                                        cred,
                                                        attrs,
-                                                        pres))
+                                                        presentation))
      continue;
-    (*pres)->credential_id = cred->id;
+    (*presentation)->credential_id = cred->id;
    return GNUNET_OK;
  }
  return GNUNET_SYSERR;
 }
diff --git a/src/regex/gnunet-daemon-regexprofiler.c b/src/regex/gnunet-daemon-regexprofiler.c
index d94b5ae46..70301338f 100644
--- a/src/regex/gnunet-daemon-regexprofiler.c
+++ b/src/regex/gnunet-daemon-regexprofiler.c
@@ -21,7 +21,7 @@
 /**
 * @file regex/gnunet-daemon-regexprofiler.c
 * @brief daemon that uses cadet to announce a regular expression. Used in
- * conjunction with gnunet-regex-profiler to announce regexes on serveral peers
+ * conjunction with gnunet-regex-profiler to announce regexes on several peers
 * without the need to explicitly connect to the cadet service running on the
 * peer from within the profiler.
 * @author Maximilian Szengel
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c
index e82e10e3b..90e06cf5f 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -173,7 +173,7 @@ struct RegexPeer
  struct GNUNET_SCHEDULER_Task *timeout;
  /**
-   * Deamon start
+   * Daemon start
   */
  struct GNUNET_TESTBED_Operation *daemon_op;
 };
@@ -718,7 +718,7 @@ find_string (void *cls);
 * @param cls Closure provided in REGEX_INTERNAL_search.
 * @param id Peer providing a regex that matches the string.
 * @param get_path Path of the get request.
- * @param get_path_length Lenght of get_path.
+ * @param get_path_length Length of get_path.
 * @param put_path Path of the put request.
 * @param put_path_length Length of the put_path.
 */
@@ -936,7 +936,7 @@ daemon_started (void *cls,
  else
  {
    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Deamon %u started successfully\n", peer->id);
+                "Daemon %u started successfully\n", peer->id);
  }
  /* Find a peer to look for a string matching the regex announced */
@@ -1027,7 +1027,7 @@ announce_next_regex (void *cls)
 /**
 * DHT connect callback. Called when we are connected to the dht service for
- * the peer in 'cls'. If successfull we connect to the stats service of this
+ * the peer in 'cls'. If successful we connect to the stats service of this
 * peer and then try to match the search string of this peer.
 *
 * @param cls internal peer id.
diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c
index 3d449a04e..ab6d65d58 100644
--- a/src/regex/gnunet-regex-simulation-profiler.c
+++ b/src/regex/gnunet-regex-simulation-profiler.c
@@ -60,7 +60,7 @@ struct ProgressMeter
  unsigned int total;
  /**
-   * Intervall for printing percentage.
+   * Interval for printing percentage.
   */
  unsigned int modnum;
diff --git a/src/regex/gnunet-service-regex.c b/src/regex/gnunet-service-regex.c
index 19250d427..7a5cc1f05 100644
--- a/src/regex/gnunet-service-regex.c
+++ b/src/regex/gnunet-service-regex.c
@@ -189,7 +189,7 @@ handle_announce (void *cls,
 * @param cls the struct ClientEntry of the client searching
 * @param id Peer providing a regex that matches the string.
 * @param get_path Path of the get request.
- * @param get_path_length Lenght of @a get_path.
+ * @param get_path_length Length of @a get_path.
 * @param put_path Path of the put request.
 * @param put_path_length Length of the @a put_path.
 */
diff --git a/src/regex/perf-regex.c b/src/regex/perf-regex.c
index 6155501f2..aea0c054f 100644
--- a/src/regex/perf-regex.c
+++ b/src/regex/perf-regex.c
@@ -63,7 +63,7 @@ print_edge (void *cls,
 /**
- * The main function of the regex performace test.
+ * The main function of the regex performance test.
 *
 * Read a set of regex from a file, combine them and create a DFA from the
 * resulting combined regex.
diff --git a/src/regex/plugin_block_regex.c b/src/regex/plugin_block_regex.c
index c087abae9..ad897493f 100644
--- a/src/regex/plugin_block_regex.c
+++ b/src/regex/plugin_block_regex.c
@@ -168,7 +168,7 @@ evaluate_block_regex (void *cls,
    return GNUNET_BLOCK_EVALUATION_RESULT_INVALID;
  case GNUNET_NO:
-    /* xquery missmatch, can happen */
+    /* xquery mismatch, can happen */
    return GNUNET_BLOCK_EVALUATION_RESULT_IRRELEVANT;
  default:
diff --git a/src/regex/regex_block_lib.c b/src/regex/regex_block_lib.c
index 159e8bf8a..cbfb553ce 100644
--- a/src/regex/regex_block_lib.c
+++ b/src/regex/regex_block_lib.c
@@ -71,7 +71,7 @@ struct RegexBlock
  uint16_t num_edges GNUNET_PACKED;
  /**
-   * Nubmer of unique destinations reachable from this state.
+   * Number of unique destinations reachable from this state.
   */
  uint16_t num_destinations GNUNET_PACKED;
@@ -158,7 +158,7 @@ struct CheckEdgeContext
 *
 * @param cls Closure, (xquery context).
 * @param token Token that follows to next state.
- * @param len Lenght of token.
+ * @param len Length of token.
 * @param key Hash of next state.
 *
 * @return #GNUNET_YES, to keep iterating
diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c
index cd33281e2..aa40851a9 100644
--- a/src/regex/regex_internal.c
+++ b/src/regex/regex_internal.c
@@ -1562,7 +1562,7 @@ automaton_create_proofs_simplify (const struct StringBuffer *R_last_ij,
 /**
 * Create proofs for all states in the given automaton. Implementation of the
- * algorithm descriped in chapter 3.2.1 of "Automata Theory, Languages, and
+ * algorithm described in chapter 3.2.1 of "Automata Theory, Languages, and
 * Computation 3rd Edition" by Hopcroft, Motwani and Ullman.
 *
 * Each state in the automaton gets assigned 'proof' and 'hash' (hash of the
@@ -1796,7 +1796,7 @@ dfa_state_create (struct REGEX_INTERNAL_Context *ctx,
 /**
 * Move from the given state 's' to the next state on transition 'str'. Consumes
- * as much of the given 'str' as possible (usefull for strided DFAs). On return
+ * as much of the given 'str' as possible (useful for strided DFAs). On return
 * 's' will point to the next state, and the length of the substring used for
 * this transition will be returned. If no transition possible 0 is returned and
 * 's' points to NULL.
@@ -1805,7 +1805,7 @@ dfa_state_create (struct REGEX_INTERNAL_Context *ctx,
 * transition possible)
 * @param str edge label to follow (will match longest common prefix)
 *
- * @return length of the substring comsumed from 'str'
+ * @return length of the substring consumed from 'str'
 */
 static unsigned int
 dfa_move (struct REGEX_INTERNAL_State **s, const char *str)
@@ -3055,7 +3055,7 @@ construct_dfa_states (struct REGEX_INTERNAL_Context *ctx,
 * @param len length of the regular expression.
 * @param max_path_len limit the path compression length to the
 *        given value. If set to 1, no path compression is applied. Set to 0 for
- *        maximal possible path compression (generally not desireable).
+ *        maximal possible path compression (generally not desirable).
 * @return DFA, needs to be freed using REGEX_INTERNAL_automaton_destroy.
 */
 struct REGEX_INTERNAL_Automaton *
@@ -3525,7 +3525,7 @@ REGEX_INTERNAL_iterate_all_edges (struct REGEX_INTERNAL_Automaton *a,
 /**
 * Struct to hold all the relevant state information in the HashMap.
 *
- * Contains the same info as the Regex Iterator parametes except the key,
+ * Contains the same info as the Regex Iterator parameters except the key,
 * which comes directly from the HashMap iterator.
 */
 struct temporal_state_store
diff --git a/src/regex/regex_internal_dht.c b/src/regex/regex_internal_dht.c
index 39d7cd847..3fb74c319 100644
--- a/src/regex/regex_internal_dht.c
+++ b/src/regex/regex_internal_dht.c
@@ -254,7 +254,7 @@ REGEX_INTERNAL_announce_cancel (struct REGEX_INTERNAL_Announcement *h)
 /**
 * Struct to keep state of running searches that have consumed a part of
- * the inital string.
+ * the initial string.
 */
 struct RegexSearchContext
 {
@@ -374,7 +374,7 @@ regex_next_edge (const struct RegexBlock *block,
 * @param exp When will this value expire.
 * @param key Key of the result.
 * @param get_path Path of the get request.
- * @param get_path_length Lenght of get_path.
+ * @param get_path_length Length of get_path.
 * @param put_path Path of the put request.
 * @param put_path_length Length of the put_path.
 * @param type Type of the result.
@@ -551,7 +551,7 @@ regex_result_iterator (void *cls,
 *
 * @param cls Closure (context of the search).
 * @param token Token that follows to next state.
- * @param len Lenght of token.
+ * @param len Length of token.
 * @param key Hash of next state.
 * @return #GNUNET_YES if should keep iterating, #GNUNET_NO otherwise.
 */
diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c
index 58cd8dc10..f8d3f993f 100644
--- a/src/regex/regex_test_lib.c
+++ b/src/regex/regex_test_lib.c
@@ -137,7 +137,7 @@ debugctx (struct RegexCombineCtx *ctx, int level)
 /**
- * Add a single regex to a context, combining with exisiting regex by-prefix.
+ * Add a single regex to a context, combining with existing regex by-prefix.
 *
 * @param ctx Context with 0 or more regexes.
 * @param regex Regex to add.
@@ -378,14 +378,14 @@ regex_add_multiple (struct RegexCombineCtx *ctx,
 /**
- * Add a single regex to a context, splitting the exisiting state.
+ * Add a single regex to a context, splitting the existing state.
 *
 * We only had a partial match, split existing state, truncate the current node
 * so it only contains the prefix, add suffix(es) as children.
 *
 * @param ctx Context to split.
- * @param len Lenght of ctx->s
+ * @param len Length of ctx->s
- * @param prefix_l Lenght of common prefix of the new regex and @a ctx->s
+ * @param prefix_l Length of common prefix of the new regex and @a ctx->s
 */
 static void
 regex_split (struct RegexCombineCtx *ctx,
@@ -431,7 +431,7 @@ regex_split (struct RegexCombineCtx *ctx,
 /**
- * Add a single regex to a context, combining with exisiting regex by-prefix.
+ * Add a single regex to a context, combining with existing regex by-prefix.
 *
 * @param ctx Context with 0 or more regexes.
 * @param regex Regex to add.
diff --git a/src/regex/regex_test_random.c b/src/regex/regex_test_random.c
index 02d59f5dc..823563d4d 100644
--- a/src/regex/regex_test_random.c
+++ b/src/regex/regex_test_random.c
@@ -55,7 +55,7 @@ get_random_literal ()
 * @param matching_str (optional) pointer to a string that will contain a string
 *                     that will be matched by the generated regex, if
 *                     'matching_str' pointer was not NULL. Make sure you
- *                     allocated at least rx_length+1 bytes for this sting.
+ *                     allocated at least rx_length+1 bytes for this string.
 *
 * @return NULL if 'rx_length' is 0, a random regex of length 'rx_length', which
 *         needs to be freed, otherwise.
diff --git a/src/regex/test_regex_api.c b/src/regex/test_regex_api.c
index 734fbdbf3..9761e80f9 100644
--- a/src/regex/test_regex_api.c
+++ b/src/regex/test_regex_api.c
@@ -80,7 +80,7 @@ end_badly ()
 * @param cls Closure provided in GNUNET_REGEX_search.
 * @param id Peer providing a regex that matches the string.
 * @param get_path Path of the get request.
- * @param get_path_length Lenght of get_path.
+ * @param get_path_length Length of get_path.
 * @param put_path Path of the put request.
 * @param put_path_length Length of the put_path.
 */
diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c
index 7cd081269..be3649dbd 100644
--- a/src/regex/test_regex_eval_api.c
+++ b/src/regex/test_regex_eval_api.c
@@ -195,7 +195,7 @@ error:
 * @param rxstr regular expression and strings with expected results to
 *              match against.
 *
- * @return 0 on successfull, non 0 otherwise
+ * @return 0 on successful, non 0 otherwise
 */
 int
 test_automaton (struct REGEX_INTERNAL_Automaton *a, regex_t *rx,
diff --git a/src/regex/test_regex_proofs.c b/src/regex/test_regex_proofs.c
index 8908084b0..289b1183b 100644
--- a/src/regex/test_regex_proofs.c
+++ b/src/regex/test_regex_proofs.c
@@ -78,7 +78,7 @@ test_proof (const char *regex)
 * @param count number of random regular expressions to test.
 * @param rx_length length of the random regular expressions.
 *
- * @return 0 on succes, number of failures otherwise.
+ * @return 0 on success, number of failures otherwise.
 */
 static unsigned int
 test_proofs_random (unsigned int count, size_t rx_length)
diff --git a/src/rest/rest.c b/src/rest/rest.c
index 0b86530f9..930f66243 100644
--- a/src/rest/rest.c
+++ b/src/rest/rest.c
@@ -38,7 +38,7 @@
 *
 * @param url URL to check
 * @param namespace namespace to check against
- * @retun GNUNET_YES if namespace matches
+ * @return GNUNET_YES if namespace matches
 */
 int
 GNUNET_REST_namespace_match (const char *url, const char *namespace)
@@ -51,7 +51,7 @@ GNUNET_REST_namespace_match (const char *url, const char *namespace)
 * Create MHD response
 *
 * @param data result
- * @retun MHD response
+ * @return MHD response
 */
 struct MHD_Response*
 GNUNET_REST_create_response (const char *data)
diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index 908dcca17..6d1236f08 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -44,7 +44,7 @@
 static uint32_t num_peers;
 /**
- * @brief numer of bits required to represent the largest peer id
+ * @brief number of bits required to represent the largest peer id
 */
 static unsigned bits_needed;
@@ -127,7 +127,7 @@ static char*stat_type_strings[] = {
  "# pushes sent",
  "# pull requests sent",
  "# pull requests sent (multi-hop peer)",
-  "# pull replys sent",
+  "# pull replies sent",
  "# push message received",
  "# push message received (multi-hop peer)",
  "# pull request message received",
@@ -1173,7 +1173,7 @@ trigger_shutdown (void *cls)
  (void) cls;
  GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Shutdown was triggerd by timeout, going down.\n");
+              "Shutdown was triggered by timeout, going down.\n");
  shutdown_task = NULL;
  GNUNET_SCHEDULER_shutdown ();
 }
@@ -2091,7 +2091,7 @@ profiler_cb (struct RPSPeer *rps_peer)
  }
  /* Only request peer ids at one peer.
-   * (It's the before-last because last one is target of the focussed attack.)
+   * (It's the before-last because last one is target of the focused attack.)
   */
  if (0 < rps_peer->num_ids_to_request)
    schedule_missing_requests (rps_peer);
@@ -2468,7 +2468,7 @@ void
 compute_diversity ()
 {
  uint32_t i;
-  /* ith entry represents the numer of occurrences in other peer's views */
+  /* ith entry represents the number of occurrences in other peer's views */
  uint32_t *count_peers = GNUNET_new_array (num_peers, uint32_t);
  uint32_t views_total_size;
  double expected;
diff --git a/src/rps/gnunet-service-rps.c b/src/rps/gnunet-service-rps.c
index 56eab288e..f6fcf3ae7 100644
--- a/src/rps/gnunet-service-rps.c
+++ b/src/rps/gnunet-service-rps.c
@@ -569,7 +569,7 @@ static struct GNUNET_PeerIdentity attacked_peer;
 * This is an assumption of the Brahms protocol and either implemented
 * via proof of work
 * or
- * assumend to be the bandwidth limitation.
+ * assumed to be the bandwidth limitation.
 */
 static uint32_t push_limit = 10000;
 #endif /* ENABLE_MALICIOUS */
@@ -599,6 +599,7 @@ do_round (void *cls);
 #if ENABLE_MALICIOUS
 static void
 do_mal_round (void *cls);
 #endif /* ENABLE_MALICIOUS */
@@ -634,7 +635,7 @@ get_peer_ctx (const struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
 * @param peer peer in question
 *
 * @return #GNUNET_YES if peer is known
- *         #GNUNET_NO  if peer is not knwon
+ *         #GNUNET_NO  if peer is not known
 */
 static int
 check_peer_known (const struct GNUNET_CONTAINER_MultiPeerMap *peer_map,
@@ -1036,9 +1037,9 @@ get_channel (struct PeerContext *peer_ctx)
 * Get the message queue (#GNUNET_MQ_Handle) of a specific peer.
 *
 * If we already have a message queue open to this client,
- * simply return it, otherways create one.
+ * simply return it, otherwise create one.
 *
- * @param peer_ctx Context of the peer of whicht to get the mq
+ * @param peer_ctx Context of the peer of which to get the mq
 * @return the #GNUNET_MQ_Handle
 */
 static struct GNUNET_MQ_Handle *
@@ -1119,7 +1120,7 @@ mq_online_check_successful (void *cls)
  if (NULL != peer_ctx->online_check_pending)
  {
    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Online check for peer %s was successfull\n",
+         "Online check for peer %s was successful\n",
         GNUNET_i2s (&peer_ctx->peer_id));
    remove_pending_message (peer_ctx->online_check_pending, GNUNET_YES);
    peer_ctx->online_check_pending = NULL;
@@ -1292,7 +1293,7 @@ destroy_peer (struct PeerContext *peer_ctx)
    LOG (GNUNET_ERROR_TYPE_DEBUG,
         "Removing unsent %s\n",
         peer_ctx->pending_messages_head->type);
-    /* Cancle pending message, too */
+    /* Cancel pending message, too */
    if ((NULL != peer_ctx->online_check_pending) &&
        (0 == memcmp (peer_ctx->pending_messages_head,
                      peer_ctx->online_check_pending,
@@ -1402,7 +1403,7 @@ mq_notify_sent_cb (void *cls)
  if (pending_msg->peer_ctx->sub == msub)
  {
    if (0 == strncmp ("PULL REPLY", pending_msg->type, 10))
-      GNUNET_STATISTICS_update (stats, "# pull replys sent", 1, GNUNET_NO);
+      GNUNET_STATISTICS_update (stats, "# pull replies sent", 1, GNUNET_NO);
    if (0 == strncmp ("PULL REQUEST", pending_msg->type, 12))
      GNUNET_STATISTICS_update (stats, "# pull requests sent", 1, GNUNET_NO);
    if (0 == strncmp ("PUSH", pending_msg->type, 4))
@@ -1417,7 +1418,7 @@ mq_notify_sent_cb (void *cls)
                                1,
                                GNUNET_NO);
  }
-  /* Do not cancle message */
+  /* Do not cancel message */
  remove_pending_message (pending_msg, GNUNET_NO);
 }
@@ -1544,7 +1545,7 @@ s2i_full (const char *string_repr)
  {
    LOG (GNUNET_ERROR_TYPE_WARNING,
         "Not able to convert string representation of PeerID to PeerID\n"
-         "Sting representation: %s (len %lu) - too short\n",
+         "String representation: %s (len %lu) - too short\n",
         string_repr,
         len);
    GNUNET_break (0);
@@ -1560,7 +1561,7 @@ s2i_full (const char *string_repr)
  {
    LOG (GNUNET_ERROR_TYPE_WARNING,
         "Not able to convert string representation of PeerID to PeerID\n"
-         "Sting representation: %s\n",
+         "String representation: %s\n",
         string_repr);
    GNUNET_break (0);
  }
@@ -2428,7 +2429,7 @@ hist_update (const struct GNUNET_PeerIdentity *ids,
    }
 #ifdef TO_FILE_FULL
    to_file (sub->file_name_view_log,
-             "+%s\t(hist)",
+             "+%s\t(history)",
             GNUNET_i2s_full (ids));
 #endif /* TO_FILE_FULL */
  }
@@ -2502,6 +2503,8 @@ add_peer_array_to_set (const struct GNUNET_PeerIdentity *peer_array,
    }
  }
 }
 #endif /* ENABLE_MALICIOUS */
@@ -2845,7 +2848,7 @@ cleanup_destroyed_channel (void *cls,
  else
  {
    /* We need this if-else construct because we need to make sure the channel
-     * (context) is cleaned up before removing the peer, but still neet to
+     * (context) is cleaned up before removing the peer, but still need to
     * compare it while checking the condition */
    remove_channel_ctx (channel_ctx);
  }
@@ -2998,7 +3001,7 @@ new_sub (const struct GNUNET_HashCode *hash,
 // /**
 //  * @brief Write all numbers in the given array into the given file
 //  *
-//  * Single numbers devided by a newline
+//  * Single numbers divided by a newline
 //  *
 //  * FIXME: The call to store_prefix_file_name expects the index of the peer,
 //  * which cannot be known to the service.
@@ -3014,14 +3017,14 @@ new_sub (const struct GNUNET_HashCode *hash,
 //   char collect_str[SIZE_DUMP_FILE + 1] = "";
 //   char *recv_str_iter;
 //   char *file_name_full;
-// 
+//
 //   recv_str_iter = collect_str;
 //   file_name_full = store_prefix_file_name (&own_identity,
 //                                            file_name);
 //   for (uint32_t i = 0; i < HISTOGRAM_FILE_SLOTS; i++)
 //   {
 //     char collect_str_tmp[8];
-// 
+//
 //     GNUNET_snprintf (collect_str_tmp,
 //                      sizeof(collect_str_tmp),
 //                      "%" PRIu32 "\n",
@@ -3213,7 +3216,7 @@ adapt_sizes (struct Sub *sub, double logestimate, double std_dev)
 {
  double estimate;
-  // double scale; // TODO this might go gloabal/config
+  // double scale; // TODO this might go global/config
  LOG (GNUNET_ERROR_TYPE_DEBUG,
       "Received a ns estimate - logest: %f, std_dev: %f (old_size: %u)\n",
@@ -3359,7 +3362,7 @@ handle_client_seed (void *cls,
 * Handle RPS request from the client.
 *
 * @param cls Client context
- * @param message Message containing the numer of updates the client wants to
+ * @param message Message containing the number of updates the client wants to
 * receive
 */
 static void
diff --git a/src/rps/gnunet-service-rps_custommap.c b/src/rps/gnunet-service-rps_custommap.c
index 392c29397..b1e73be17 100644
--- a/src/rps/gnunet-service-rps_custommap.c
+++ b/src/rps/gnunet-service-rps_custommap.c
@@ -48,10 +48,10 @@
 *
 * This list is expected to
 * - be altered in small steps frequently
- * - be cleared regularily
+ * - be cleared regularly
 * - often being queried whether a peer is contained
 * - alter indices of peers
- * - contain continous indices 0 <= i < len
+ * - contain continuous indices 0 <= i < len
 * - not contain duplicate peers
 */
 struct CustomPeerMap
diff --git a/src/rps/rps-sampler_common.c b/src/rps/rps-sampler_common.c
index 488ed8e01..a30ba06a1 100644
--- a/src/rps/rps-sampler_common.c
+++ b/src/rps/rps-sampler_common.c
@@ -661,7 +661,7 @@ RPS_sampler_get_rand_peer_info (struct RPS_Sampler *sampler,
 /**
- * Cancle a request issued through #RPS_sampler_n_rand_peers_ready_cb.
+ * Cancel a request issued through #RPS_sampler_n_rand_peers_ready_cb.
 *
 * @param req_handle the handle to the request
 */
@@ -699,7 +699,7 @@ RPS_sampler_request_cancel (struct RPS_SamplerRequestHandle *req_handle)
 /**
- * Cancle a request issued through #RPS_sampler_sinlge_info_ready_cb.
+ * Cancel a request issued through #RPS_sampler_sinlge_info_ready_cb.
 *
 * @param req_handle the handle to the request
 */
diff --git a/src/rps/rps-test_util.c b/src/rps/rps-test_util.c
index 6dee20c95..8fd82f7b3 100644
--- a/src/rps/rps-test_util.c
+++ b/src/rps/rps-test_util.c
@@ -20,7 +20,7 @@
 /**
 * @file rps/rps-test_util.c
- * @brief Some utils faciliating the view into the internals for the sampler
+ * @brief Some utils facilitating the view into the internals for the sampler
 *        needed for evaluation
 *
 * @author Julius Bünger
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c
index 8b69dae96..bb4c3597e 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -714,7 +714,7 @@ reconnect (struct GNUNET_RPS_Handle *h);
 /**
 * Error handler for mq.
 *
- * This function is called whan mq encounters an error.
+ * This function is called when mq encounters an error.
 * Until now mq doesn't provide useful error messages.
 *
 * @param cls the closure
@@ -1192,9 +1192,9 @@ GNUNET_RPS_act_malicious (struct GNUNET_RPS_Handle *h,
 /**
- * Cancle an issued request.
+ * Cancel an issued request.
 *
- * @param rh request handle of request to cancle
+ * @param rh request handle of request to cancel
 */
 void
 GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh)
@@ -1223,9 +1223,9 @@ GNUNET_RPS_request_cancel (struct GNUNET_RPS_Request_Handle *rh)
 /**
- * Cancle an issued single info request.
+ * Cancel an issued single info request.
 *
- * @param rhs request handle of request to cancle
+ * @param rhs request handle of request to cancel
 */
 void
 GNUNET_RPS_request_single_info_cancel (
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
index de09b423f..ab132ec8a 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -1957,7 +1957,7 @@ profiler_cb (struct RPSPeer *rps_peer)
  }
  /* Only request peer ids at one peer.
-   * (It's the before-last because last one is target of the focussed attack.)
+   * (It's the before-last because last one is target of the focused attack.)
   */
  if (eval_peer == rps_peer)
    schedule_missing_requests (rps_peer);
@@ -2306,7 +2306,7 @@ void
 compute_diversity ()
 {
  uint32_t i;
-  /* ith entry represents the numer of occurrences in other peer's views */
+  /* ith entry represents the number of occurrences in other peer's views */
  uint32_t *count_peers = GNUNET_new_array (num_peers, uint32_t);
  uint32_t views_total_size;
  double expected;
@@ -2596,8 +2596,8 @@ stat_str_2_type (const char *stat_str)
  {
    return STAT_TYPE_SENT_PULL_REQ;
  }
-  else if (0 == strncmp ("# pull replys sent", stat_str, strlen (
+  else if (0 == strncmp ("# pull replies sent", stat_str, strlen (
-                           "# pull replys sent")))
+                           "# pull replies sent")))
  {
    return STAT_TYPE_SENT_PULL_REP;
  }
@@ -2670,7 +2670,7 @@ stat_type_2_str (enum STAT_TYPE stat_type)
    return "# pull requests sent";
  case STAT_TYPE_SENT_PULL_REP:
-    return "# pull replys sent";
+    return "# pull replies sent";
  case STAT_TYPE_RECV_PUSH_SEND:
    return "# push message received";
diff --git a/src/scalarproduct/gnunet-scalarproduct.c b/src/scalarproduct/gnunet-scalarproduct.c
index 7dc8ff5c3..14495de05 100644
--- a/src/scalarproduct/gnunet-scalarproduct.c
+++ b/src/scalarproduct/gnunet-scalarproduct.c
@@ -277,7 +277,7 @@ run (void *cls,
    struct GNUNET_SCALARPRODUCT_Element element;
    char*separator = NULL;
-    /* get the length of the current key,value; tupel */
+    /* get the length of the current key,value; tuple */
    for (end = begin; *end != ';'; end++)
      if (*end == ',')
        separator = end;
diff --git a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
index e33d589be..dc43b5a54 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
@@ -714,7 +714,7 @@ cb_intersection_element_removed (void *cls,
 *        to accept it, otherwise the request will be refused
 *        Note that we can't just return value from the listen callback,
 *        as it is also necessary to specify the set we want to do the
- *        operation with, whith sometimes can be derived from the context
+ *        operation with, which sometimes can be derived from the context
 *        message. It's necessary to specify the timeout.
 */
 static void
diff --git a/src/scalarproduct/gnunet-service-scalarproduct_alice.c b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
index 1ca7f61da..665d2ad7f 100644
--- a/src/scalarproduct/gnunet-service-scalarproduct_alice.c
+++ b/src/scalarproduct/gnunet-service-scalarproduct_alice.c
@@ -972,7 +972,7 @@ cb_intersection_element_removed (void *cls,
 *        to accept it, otherwise the request will be refused
 *        Note that we can't just return value from the listen callback,
 *        as it is also necessary to specify the set we want to do the
- *        operation with, whith sometimes can be derived from the context
+ *        operation with, which sometimes can be derived from the context
 *        message. It's necessary to specify the timeout.
 */
 static void
diff --git a/src/scalarproduct/scalarproduct_api.c b/src/scalarproduct/scalarproduct_api.c
index 4ac39614a..44d6bd812 100644
--- a/src/scalarproduct/scalarproduct_api.c
+++ b/src/scalarproduct/scalarproduct_api.c
@@ -417,7 +417,7 @@ GNUNET_SCALARPRODUCT_start_computation (
                                 h);
  if (NULL == h->mq)
  {
-    /* missconfigured scalarproduct service */
+    /* misconfigured scalarproduct service */
    GNUNET_break (0);
    GNUNET_free (h);
    return NULL;
diff --git a/src/secretsharing/gnunet-secretsharing-profiler.c b/src/secretsharing/gnunet-secretsharing-profiler.c
index 3465e0167..76bba0bc9 100644
--- a/src/secretsharing/gnunet-secretsharing-profiler.c
+++ b/src/secretsharing/gnunet-secretsharing-profiler.c
@@ -450,7 +450,7 @@ session_disconnect_adapter (void *cls, void *op_result)
 * @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
 peer_info_cb (void *cb_cls,
diff --git a/src/secretsharing/gnunet-service-secretsharing.c b/src/secretsharing/gnunet-service-secretsharing.c
index 2177134f6..939b7827d 100644
--- a/src/secretsharing/gnunet-service-secretsharing.c
+++ b/src/secretsharing/gnunet-service-secretsharing.c
@@ -241,7 +241,7 @@ struct DecryptSession
  /**
   * Share of the local peer.
-   * Containts other important information, such as
+   * Contains other important information, such as
   * the list of other peers.
   */
  struct GNUNET_SECRETSHARING_Share *share;
@@ -379,7 +379,7 @@ time_between (struct GNUNET_TIME_Absolute start,
 /**
- * Compare two peer identities.  Indended to be used with qsort or bsearch.
+ * Compare two peer identities.  Intended to be used with qsort or bsearch.
 *
 * @param p1 Some peer identity.
 * @param p2 Some peer identity.
@@ -1931,9 +1931,9 @@ decrypt_new_element (void *cls,
  gcry_mpi_t w;
  /* ciphertext component #1 */
  gcry_mpi_t c1;
-  /* temporary variable (for comparision) #1 */
+  /* temporary variable (for comparison) #1 */
  gcry_mpi_t tmp1;
-  /* temporary variable (for comparision) #2 */
+  /* temporary variable (for comparison) #2 */
  gcry_mpi_t tmp2;
  if (NULL == element)
diff --git a/src/secretsharing/secretsharing_api.c b/src/secretsharing/secretsharing_api.c
index b29109da9..98f800c95 100644
--- a/src/secretsharing/secretsharing_api.c
+++ b/src/secretsharing/secretsharing_api.c
@@ -435,14 +435,14 @@ GNUNET_SECRETSHARING_plaintext_generate_i (struct
 * Encrypt a value.  This operation is executed locally, no communication is
 * necessary.
 *
- * This is a helper function, encryption can be done soley with a session's public key
+ * This is a helper function, encryption can be done solely with a session's public key
 * and the crypto system parameters.
 *
 * @param public_key public key to use for decryption
 * @param message message to encrypt
 * @param message_size number of bytes in @a message
 * @param result_ciphertext pointer to store the resulting ciphertext
- * @return #GNUNET_YES on succes, #GNUNET_SYSERR if the message is invalid (invalid range)
+ * @return #GNUNET_YES on success, #GNUNET_SYSERR if the message is invalid (invalid range)
 */
 int
 GNUNET_SECRETSHARING_encrypt (const struct
diff --git a/src/set/gnunet-service-set_union.c b/src/set/gnunet-service-set_union.c
index c06b7cddf..d762e4bba 100644
--- a/src/set/gnunet-service-set_union.c
+++ b/src/set/gnunet-service-set_union.c
@@ -490,7 +490,7 @@ op_get_element (struct Operation *op,
 *
 * @param op the union operation
 * @param ee the element entry
- * @parem received was this element received from the remote peer?
+ * @param received was this element received from the remote peer?
 */
 static void
 op_register_element (struct Operation *op,
@@ -1836,7 +1836,7 @@ send_missing_full_elements_iter (void *cls,
 /**
 * Handle a request for full set transmission.
 *
- * @parem cls closure, a set union operation
+ * @param cls closure, a set union operation
 * @param mh the demand message
 */
 void
@@ -1870,7 +1870,7 @@ handle_union_p2p_request_full (void *cls,
 /**
 * Handle a "full done" message.
 *
- * @parem cls closure, a set union operation
+ * @param cls closure, a set union operation
 * @param mh the demand message
 */
 void
@@ -1930,7 +1930,7 @@ handle_union_p2p_full_done (void *cls,
 * Check a demand by the other peer for elements based on a list
 * of `struct GNUNET_HashCode`s.
 *
- * @parem cls closure, a set union operation
+ * @param cls closure, a set union operation
 * @param mh the demand message
 * @return #GNUNET_OK if @a mh is well-formed
 */
@@ -1962,7 +1962,7 @@ check_union_p2p_demand (void *cls,
 * Handle a demand by the other peer for elements based on a list
 * of `struct GNUNET_HashCode`s.
 *
- * @parem cls closure, a set union operation
+ * @param cls closure, a set union operation
 * @param mh the demand message
 */
 void
diff --git a/src/set/set_api.c b/src/set/set_api.c
index a082c23c1..6b3dc940c 100644
--- a/src/set/set_api.c
+++ b/src/set/set_api.c
@@ -490,7 +490,7 @@ set_operation_destroy (struct GNUNET_SET_OperationHandle *oh)
  if (NULL != oh->conclude_mqm)
    GNUNET_MQ_discard (oh->conclude_mqm);
-  /* is the operation already commited? */
+  /* is the operation already committed? */
  if (NULL != set)
  {
    GNUNET_CONTAINER_DLL_remove (set->ops_head,
@@ -649,7 +649,7 @@ create_internal (const struct GNUNET_CONFIGURATION_Handle *cfg,
 * @param op operation supported by the set
 *        Note that the operation has to be specified
 *        beforehand, as certain set operations need to maintain
- *        data structures spefific to the operation
+ *        data structures specific to the operation
 * @return a handle to the set
 */
 struct GNUNET_SET_Handle *
@@ -1163,7 +1163,7 @@ GNUNET_SET_commit (struct GNUNET_SET_OperationHandle *oh,
 * @param set the set to iterate over
 * @param iter the iterator to call for each element
 * @param iter_cls closure for @a iter
- * @return #GNUNET_YES if the iteration started successfuly,
+ * @return #GNUNET_YES if the iteration started successfully,
 *         #GNUNET_NO if another iteration is active
 *         #GNUNET_SYSERR if the set is invalid (e.g. the server crashed, disconnected)
 */
diff --git a/src/set/test_set_api.c b/src/set/test_set_api.c
index 4b9b0ff82..d1afdd354 100644
--- a/src/set/test_set_api.c
+++ b/src/set/test_set_api.c
@@ -371,7 +371,7 @@ run (void *cls,
              set2);
  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &app_id);
-  /* test if canceling an uncommited request works! */
+  /* test if canceling an uncommitted request works! */
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Launching and instantly stopping set operation\n");
  my_oh = GNUNET_SET_prepare (&local_id,
diff --git a/src/seti/seti_api.c b/src/seti/seti_api.c
index 5b88b0469..933aec0e1 100644
--- a/src/seti/seti_api.c
+++ b/src/seti/seti_api.c
@@ -309,7 +309,7 @@ set_operation_destroy (struct GNUNET_SETI_OperationHandle *oh)
  if (NULL != oh->conclude_mqm)
    GNUNET_MQ_discard (oh->conclude_mqm);
-  /* is the operation already commited? */
+  /* is the operation already committed? */
  if (NULL != set)
  {
    GNUNET_CONTAINER_DLL_remove (set->ops_head,
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index 862b78aa9..bd1113f15 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -685,7 +685,7 @@ calculate_perf_rtt() {
    int bytes_transmitted = 0;
    /**
-     *  Calculate RGNUNET_SETU_AcceptMessageRT of Fullsync normaly 1 or 1.5 depending
+     *  Calculate RGNUNET_SETU_AcceptMessageRT of Fullsync normally 1 or 1.5 depending
     */
     if (( perf_rtt.element_full.received != 0 ) ||
         ( perf_rtt.element_full.sent != 0)
@@ -1090,7 +1090,7 @@ op_get_element (struct Operation *op,
 *
 * @param op the union operation
 * @param ee the element entry
- * @parem received was this element received from the remote peer?
+ * @param received was this element received from the remote peer?
 */
 static void
 op_register_element (struct Operation *op,
@@ -2419,7 +2419,7 @@ send_missing_full_elements_iter (void *cls,
 /**
 * Handle a request for full set transmission.
 *
- * @parem cls closure, a set union operation
+ * @param cls closure, a set union operation
 * @param mh the demand message
 */
 static void
@@ -2449,7 +2449,7 @@ handle_union_p2p_request_full (void *cls,
 /**
 * Handle a "full done" message.
 *
- * @parem cls closure, a set union operation
+ * @param cls closure, a set union operation
 * @param mh the demand message
 */
 static void
@@ -2510,7 +2510,7 @@ handle_union_p2p_full_done (void *cls,
 * Check a demand by the other peer for elements based on a list
 * of `struct GNUNET_HashCode`s.
 *
- * @parem cls closure, a set union operation
+ * @param cls closure, a set union operation
 * @param mh the demand message
 * @return #GNUNET_OK if @a mh is well-formed
 */
@@ -2538,7 +2538,7 @@ check_union_p2p_demand (void *cls,
 * Handle a demand by the other peer for elements based on a list
 * of `struct GNUNET_HashCode`s.
 *
- * @parem cls closure, a set union operation
+ * @param cls closure, a set union operation
 * @param mh the demand message
 */
 static void
diff --git a/src/setu/perf_setu_api.c b/src/setu/perf_setu_api.c
index 3b82e8af9..b273f9c71 100644
--- a/src/setu/perf_setu_api.c
+++ b/src/setu/perf_setu_api.c
@@ -379,7 +379,7 @@ run (void *cls,
                set2);
    GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &app_id);
-    /* test if canceling an uncommited request works! */
+    /* test if canceling an uncommitted request works! */
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                "Launching and instantly stopping set operation\n");
    my_oh = GNUNET_SETU_prepare (&local_id,
diff --git a/src/setu/setu_api.c b/src/setu/setu_api.c
index dd3a4a769..0a09b18b2 100644
--- a/src/setu/setu_api.c
+++ b/src/setu/setu_api.c
@@ -293,7 +293,7 @@ set_operation_destroy (struct GNUNET_SETU_OperationHandle *oh)
  if (NULL != oh->conclude_mqm)
    GNUNET_MQ_discard (oh->conclude_mqm);
-  /* is the operation already commited? */
+  /* is the operation already committed? */
  if (NULL != set)
  {
    GNUNET_CONTAINER_DLL_remove (set->ops_head,
diff --git a/src/setu/test_setu_api.c b/src/setu/test_setu_api.c
index d5c9f5b7a..2fb7d015e 100644
--- a/src/setu/test_setu_api.c
+++ b/src/setu/test_setu_api.c
@@ -378,7 +378,7 @@ run (void *cls,
              set2);
  GNUNET_CRYPTO_hash_create_random (GNUNET_CRYPTO_QUALITY_WEAK, &app_id);
-  /* test if canceling an uncommited request works! */
+  /* test if canceling an uncommitted request works! */
  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
              "Launching and instantly stopping set operation\n");
  my_oh = GNUNET_SETU_prepare (&local_id,
diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c
index b9aedb4e7..5894ef68c 100644
--- a/src/statistics/gnunet-statistics.c
+++ b/src/statistics/gnunet-statistics.c
@@ -396,7 +396,7 @@ print_finish (void *cls)
 * Implements #GNUNET_STATISTICS_Callback
 *
 * @param cls Closure - The index of the node.
- * @param succes Whether statistics were obtained successfully.
+ * @param success Whether statistics were obtained successfully.
 */
 static void
 continuation_print (void *cls,
diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index bf0a90b45..d6c2680b8 100644
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -1287,7 +1287,7 @@ add_setter_action (struct GNUNET_STATISTICS_Handle *h,
    {
      if (ACTION_UPDATE == type)
      {
-        /* make delta cummulative */
+        /* make delta cumulative */
        delta = (int64_t) value;
        ai->value += delta;
      }
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
diff --git a/src/testing/testing_api_cmd_hello_world_birth.c b/src/testing/testing_api_cmd_hello_world_birth.c
index 2a5bded92..9d60059a5 100644
--- a/src/testing/testing_api_cmd_hello_world_birth.c
+++ b/src/testing/testing_api_cmd_hello_world_birth.c
@@ -95,16 +95,16 @@ hello_world_birth_run (void *cls,
                       struct GNUNET_TESTING_Interpreter *is)
 {
  struct HelloWorldBirthState *hbs = cls;
-  struct GNUNET_TIME_Relative relativ;
+  struct GNUNET_TIME_Relative relative;
-  relativ = GNUNET_TIME_absolute_get_difference (*hbs->date,
+  relative = GNUNET_TIME_absolute_get_difference (*hbs->date,
                                                 GNUNET_TIME_absolute_get ());
-  if (0 == relativ.rel_value_us % 10)
+  if (0 == relative.rel_value_us % 10)
  {
    hbs->what_am_i = "creature!";
  }
-  else if (0 == relativ.rel_value_us % 2)
+  else if (0 == relative.rel_value_us % 2)
  {
    hbs->what_am_i = "girl!";
  }
diff --git a/src/testing/testing_api_loop.c b/src/testing/testing_api_loop.c
index dbd86ba90..1b50b9ff5 100644
--- a/src/testing/testing_api_loop.c
+++ b/src/testing/testing_api_loop.c
@@ -220,7 +220,7 @@ run_finish_task_sync (void *cls)
      - sync_state->start_finish_time.abs_value_us)
  {
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
-                "The command with label %s did not finish its asyncronous task in time.\n",
+                "The command with label %s did not finish its asynchronous task in time.\n",
                cmd->label);
    is->result = GNUNET_SYSERR;
    GNUNET_SCHEDULER_shutdown ();
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index 9dd2797df..a871d980f 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -1954,7 +1954,7 @@ queue_read (void *cls)
       wrong key for everything after the rekey; in that case, we have
       to re-do the decryption at 'total' instead of at 'max'.
       However, we have to take into account that the plaintext buffer may have
-       already contained data and not jumpt too far ahead in the ciphertext.
+       already contained data and not jumped too far ahead in the ciphertext.
       If there is no rekey and the last message is incomplete (max > total),
       it is safe to keep the decryption so we shift by 'max' */
    if (GNUNET_YES == queue->rekeyed)
diff --git a/src/transport/gnunet-communicator-udp.c b/src/transport/gnunet-communicator-udp.c
index d75f4ae00..fa9bb5d0a 100644
--- a/src/transport/gnunet-communicator-udp.c
+++ b/src/transport/gnunet-communicator-udp.c
@@ -626,7 +626,7 @@ struct ReceiverAddress
  int rekeying;
  /**
-   * Numer of kce we retain for sending the rekeying shared secret.
+   * Number of kce we retain for sending the rekeying shared secret.
   */
  int number_rekeying_kce;
@@ -1130,7 +1130,7 @@ sender_destroy (struct SenderAddress *sender)
 *
 * @param msec master secret for calculation
 * @param serial number for the @a smac calculation
- * @param key[out] where to write the decrption key
+ * @param key[out] where to write the decryption key
 * @param iv[out] where to write the IV
 */
 static void
@@ -1235,7 +1235,7 @@ check_timeouts (void *cls)
 /**
- * Calcualte cmac from master in @a ss.
+ * Calculate cmac from master in @a ss.
 *
 * @param ss[in,out] data structure to complete
 */
@@ -1811,7 +1811,7 @@ kce_generate_rekey_cb (void *cls)
 * recently).
 *
 * @param ss shared secret to generate ACKs for
- * @param intial The SharedSecret came with initial KX.
+ * @param initial The SharedSecret came with initial KX.
 */
 static void
 consider_ss_ack (struct SharedSecret *ss, int initial)
@@ -1866,7 +1866,7 @@ consider_ss_ack (struct SharedSecret *ss, int initial)
    ack.acks_available = ss->sender->acks_available;
    ack.cmac = ss_tell->cmac;
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Notifying transport of UDPAck %s with intial %u and master %s\n",
+                "Notifying transport of UDPAck %s with initial %u and master %s\n",
                GNUNET_i2s_full (&ss_tell->sender->target),
                initial,
                GNUNET_h2s (&(ss_tell->master)));
@@ -2486,7 +2486,7 @@ udp_address_to_sockaddr (const char *bindto, socklen_t *sock_len)
  colon = strrchr (cp, ':');
  if (NULL != colon)
  {
-    /* interpet value after colon as port */
+    /* interpret value after colon as port */
    *colon = '\0';
    colon++;
    if (1 == sscanf (colon, "%u%1s", &port, dummy))
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c
index ef3a6292b..019f3914f 100644
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ b/src/transport/gnunet-helper-transport-bluetooth.c
@@ -416,7 +416,7 @@ do_align:
    else
    {
      /* need to copy to private buffer to align;
-       * yes, we go a bit more spagetti than usual here */
+       * yes, we go a bit more spaghetti than usual here */
      goto do_align;
    }
  }
diff --git a/src/transport/gnunet-helper-transport-wlan.c b/src/transport/gnunet-helper-transport-wlan.c
index d90565c9c..72dd8b594 100644
--- a/src/transport/gnunet-helper-transport-wlan.c
+++ b/src/transport/gnunet-helper-transport-wlan.c
@@ -983,7 +983,7 @@ do_align:
    else
    {
      /* need to copy to private buffer to align;
-       * yes, we go a bit more spagetti than usual here */
+       * yes, we go a bit more spaghetti than usual here */
      goto do_align;
    }
  }
@@ -1093,7 +1093,7 @@ ieee80211_radiotap_iterator_init (struct
    iterator->arg += sizeof(uint32_t);
    /*
     * no need to check again for blowing past stated radiotap
-     * header length, becuase ieee80211_radiotap_iterator_next
+     * header length, because ieee80211_radiotap_iterator_next
     * checks it before it is dereferenced
     */}
  /* we are all initialized happily */
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
index cbf795eea..613477220 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -47,7 +47,7 @@
 * - When we passively learned DV (with unconfirmed freshness), we
 *   right now add the path to our list but with a zero path_valid_until
 *   time and only use it for unconfirmed routes.  However, we could consider
- *   triggering an explicit validation mechansim ourselves, specifically routing
+ *   triggering an explicit validation mechanism ourselves, specifically routing
 *   a challenge-response message over the path [ROUTING]
 * = if available, try to confirm unconfirmed DV paths when trying to establish
 *   virtual link for a `struct IncomingRequest`. (i.e. if DVH is
@@ -83,7 +83,7 @@
 /**
 * Maximum number of messages we acknowledge together in one
- * cummulative ACK.  Larger values may save a bit of bandwidth.
+ * cumulative ACK.  Larger values may save a bit of bandwidth.
 */
 #define MAX_CUMMULATIVE_ACKS 64
@@ -453,7 +453,7 @@ struct TransportReliabilityBoxMessage
 struct TransportCummulativeAckPayloadP
 {
  /**
-   * How long was the ACK delayed for generating cummulative ACKs?
+   * How long was the ACK delayed for generating cumulative ACKs?
   * Used to calculate the correct network RTT by taking the receipt
   * time of the ack minus the transmission time of the sender minus
   * this value.
@@ -514,7 +514,7 @@ struct TransportFragmentBoxMessage
  /**
   * Unique ID of this fragment (and fragment transmission!). Will
-   * change even if a fragement is retransmitted to make each
+   * change even if a fragment is retransmitted to make each
   * transmission attempt unique! If a client receives a duplicate
   * fragment (same @e frag_off for same @a msg_uuid, it must send
   * #GNUNET_MESSAGE_TYPE_TRANSPORT_RELIABILITY_ACK immediately.
@@ -1944,7 +1944,7 @@ struct Neighbour
  struct GNUNET_TIME_Absolute last_dv_learn_monotime;
  /**
-   * Do we have the lastest value for @e last_dv_learn_monotime from
+   * Do we have the latest value for @e last_dv_learn_monotime from
   * PEERSTORE yet, or are we still waiting for a reply of PEERSTORE?
   */
  int dv_monotime_available;
@@ -2238,7 +2238,7 @@ struct AcknowledgementCummulator
  struct TransportCummulativeAckPayload ack_uuids[MAX_CUMMULATIVE_ACKS];
  /**
-   * Task scheduled either to transmit the cummulative ACK message,
+   * Task scheduled either to transmit the cumulative ACK message,
   * or to clean up this data structure after extended periods of
   * inactivity (if @e num_acks is zero).
   */
@@ -2657,7 +2657,7 @@ static struct GNUNET_CONTAINER_MultiPeerMap *backtalkers;
 /**
 * Map from PIDs to `struct AcknowledgementCummulator`s.
- * Here we track the cummulative ACKs for transmission.
+ * Here we track the cumulative ACKs for transmission.
 */
 static struct GNUNET_CONTAINER_MultiPeerMap *ack_cummulators;
@@ -2735,7 +2735,7 @@ static struct PendingAcknowledgement *pa_head;
 static struct PendingAcknowledgement *pa_tail;
 /**
- * List of incomming connections where we are trying
+ * List of incoming connections where we are trying
 * to get a connection back established. Length
 * kept in #ir_total.
 */
@@ -3888,10 +3888,10 @@ client_send_response (struct PendingMessage *pm)
  if (NULL != tc)
  {
    struct GNUNET_MQ_Envelope *env;
-    struct SendOkMessage *som;
+    struct SendOkMessage *so_msg;
-    env = GNUNET_MQ_msg (som, GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK);
+    env = GNUNET_MQ_msg (so_msg, GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK);
-    som->peer = vl->target;
+    so_msg->peer = vl->target;
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                "Confirming transmission of <%llu> to %s\n",
                pm->logging_uuid,
@@ -4713,7 +4713,7 @@ route_control_message_without_fc (const struct GNUNET_PeerIdentity *target,
  }
  if ((NULL != n) && (NULL != dv))
    options &= ~RMO_REDUNDANT; /* We will do one DV and one direct, that's
-                                  enough for redunancy, so clear the flag. */
+                                  enough for redundancy, so clear the flag. */
  rtt1 = GNUNET_TIME_UNIT_FOREVER_REL;
  rtt2 = GNUNET_TIME_UNIT_FOREVER_REL;
  if (NULL != n)
@@ -4862,7 +4862,7 @@ check_vl_transmission (struct VirtualLink *vl)
        vl->outbound_fc_window_size)
    {
      GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                  "Stalled transmision on VL %s due to flow control: %llu < %llu\n",
+                  "Stalled transmission on VL %s due to flow control: %llu < %llu\n",
                  GNUNET_i2s (&vl->target),
                  (unsigned long long) vl->outbound_fc_window_size,
                  (unsigned long long) (pm->bytes_msg
@@ -5286,7 +5286,7 @@ handle_raw_message (void *cls, const struct GNUNET_MessageHeader *mh)
       it. Thus logging as error for now. */
    GNUNET_break_op (0);
    GNUNET_STATISTICS_update (GST_stats,
-                              "# CORE messages droped (virtual link still down)",
+                              "# CORE messages dropped (virtual link still down)",
                              1,
                              GNUNET_NO);
@@ -5296,7 +5296,7 @@ handle_raw_message (void *cls, const struct GNUNET_MessageHeader *mh)
  if (vl->incoming_fc_window_size_ram > UINT_MAX - size)
  {
    GNUNET_STATISTICS_update (GST_stats,
-                              "# CORE messages droped (FC arithmetic overflow)",
+                              "# CORE messages dropped (FC arithmetic overflow)",
                              1,
                              GNUNET_NO);
@@ -5306,7 +5306,7 @@ handle_raw_message (void *cls, const struct GNUNET_MessageHeader *mh)
  if (vl->incoming_fc_window_size_ram + size > vl->available_fc_window_size)
  {
    GNUNET_STATISTICS_update (GST_stats,
-                              "# CORE messages droped (FC window overflow)",
+                              "# CORE messages dropped (FC window overflow)",
                              1,
                              GNUNET_NO);
    finish_cmc_handling (cmc);
@@ -5397,7 +5397,7 @@ check_fragment_box (void *cls, const struct TransportFragmentBoxMessage *fb)
 /**
- * Clean up an idle cummulative acknowledgement data structure.
+ * Clean up an idle cumulative acknowledgement data structure.
 *
 * @param cls a `struct AcknowledgementCummulator *`
 */
@@ -5416,7 +5416,7 @@ destroy_ack_cummulator (void *cls)
 /**
- * Do the transmission of a cummulative acknowledgement now.
+ * Do the transmission of a cumulative acknowledgement now.
 *
 * @param cls a `struct AcknowledgementCummulator *`
 */
@@ -5674,7 +5674,7 @@ handle_fragment_box (void *cls, const struct TransportFragmentBoxMessage *fb)
    }
  }
-  /* Compute cummulative ACK */
+  /* Compute cumulative ACK */
  cdelay = GNUNET_TIME_absolute_get_duration (rc->last_frag);
  cdelay = GNUNET_TIME_relative_multiply (cdelay, rc->msg_missing / fsize);
  if (0 == rc->msg_missing)
@@ -5911,7 +5911,7 @@ completed_pending_message (struct PendingMessage *pm)
 * The @a pa was acknowledged, process the acknowledgement.
 *
 * @param pa the pending acknowledgement that was satisfied
- * @param ack_delay artificial delay from cummulative acks created by the
+ * @param ack_delay artificial delay from cumulative acks created by the
 * other peer
 */
 static void
@@ -7353,7 +7353,7 @@ handle_dv_box (void *cls, const struct TransportDVBoxMessage *dvb)
      path = tmp;
    }
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Received DVBox with remainig path %s\n",
+                "Received DVBox with remaining path %s\n",
                path);
    GNUNET_free (path);
  }
@@ -7418,7 +7418,7 @@ handle_dv_box (void *cls, const struct TransportDVBoxMessage *dvb)
  dv_hmac (&key, &hmac, hdr, hdr_len);
  if (0 != GNUNET_memcmp (&hmac, &dvb->hmac))
  {
-    /* HMAC missmatch, disard! */
+    /* HMAC mismatch, discard! */
    GNUNET_break_op (0);
    finish_cmc_handling (cmc);
    return;
@@ -7493,7 +7493,7 @@ handle_dv_box (void *cls, const struct TransportDVBoxMessage *dvb)
          &ppay.sender_sig,
          &ppay.sender.public_key))
      {
-        /* Signature invalid, disard! */
+        /* Signature invalid, discard! */
        GNUNET_break_op (0);
        finish_cmc_handling (cmc);
        return;
@@ -8210,7 +8210,7 @@ handle_flow_control (void *cls, const struct TransportFlowControlMessage *fc)
       % FC_NO_CHANGE_REPLY_PROBABILITY))
  {
    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Consider re-sending our FC message, as clearly the  ther peer's idea of the window is not up-to-date (%llu vs %llu)\n",
+                "Consider re-sending our FC message, as clearly the other peer's idea of the window is not up-to-date (%llu vs %llu)\n",
                (unsigned long long) wnd,
                (unsigned long long) vl->incoming_fc_window_size);
    consider_sending_fc (vl);
@@ -8563,7 +8563,7 @@ reliability_box_message (struct Queue *queue,
 /**
 * Change the value of the `next_attempt` field of @a pm
 * to @a next_attempt and re-order @a pm in the transmission
- * list as required by the new timestmap.
+ * list as required by the new timestamp.
 *
 * @param pm a pending message to update
 * @param next_attempt timestamp to use
@@ -8755,7 +8755,7 @@ select_best_pending_from_link (struct PendingMessageScoreContext *sc,
          10;     /* increase weight, favors 'sc->best', which is low latency */
      if (0 != queue->mtu)
      {
-        /* Grant bonus if we are bellow MTU, larger bonus the closer we will
+        /* Grant bonus if we are below MTU, larger bonus the closer we will
           be to the MTU */
        if (queue->mtu > sc->real_overhead + sc->best->bytes_msg)
          sc_score -= queue->mtu - (sc->real_overhead + sc->best->bytes_msg);
@@ -9645,7 +9645,9 @@ handle_add_queue_message (void *cls,
  if (NULL != queue)
  {
    neighbour = queue->neighbour;
-  } else {
+  }
+  else
+  {
    neighbour = lookup_neighbour (&aqm->receiver);
    if (NULL == neighbour)
    {
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index a819d82a5..24cc6464a 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -357,7 +357,7 @@ static struct TransportClient *sync_client;
 /**
 * Peer identity that is all zeros, used as a way to indicate
- * "all peers".  Used for comparissons.
+ * "all peers".  Used for comparisons.
 */
 static struct GNUNET_PeerIdentity all_zeros;
@@ -830,7 +830,7 @@ handle_client_send (void *cls, const struct OutboundMessage *obm)
 /**
 * Take the given address and append it to the set of results sent back to
- * the client.  This function may be called serveral times for a single
+ * the client.  This function may be called several times for a single
 * conversion.   The last invocation will be with a @a address of
 * NULL and a @a res of #GNUNET_OK.  Thus, to indicate conversion
 * errors, the callback might be called first with @a address NULL and
@@ -877,7 +877,7 @@ transmit_address_to_client (void *cls, const char *buf, int res)
    }
  }
  GNUNET_assert (GNUNET_OK == res);
-  /* succesful conversion, append*/
+  /* successful conversion, append*/
  slen = strlen (buf) + 1;
  env =
    GNUNET_MQ_msg_extra (atsm,
@@ -1545,7 +1545,7 @@ kill_session (const char *plugin_name, struct GNUNET_ATS_Session *session)
 /**
 * Black list check result for try_connect call
- * If connection to the peer is allowed request adddress and ???
+ * If connection to the peer is allowed request address and ???
 *
 * @param cls the message
 * @param peer the peer
@@ -1782,7 +1782,7 @@ plugin_env_address_change_notification (
 *
 * @param cls closure
 * @param address which address was the session for
- * @param session which session is being destoyed
+ * @param session which session is being destroyed
 */
 static void
 plugin_env_session_end (void *cls,
diff --git a/src/transport/gnunet-service-transport_validation.c b/src/transport/gnunet-service-transport_validation.c
index e5d670889..86161bd85 100644
--- a/src/transport/gnunet-service-transport_validation.c
+++ b/src/transport/gnunet-service-transport_validation.c
@@ -68,7 +68,7 @@ enum GNUNET_TRANSPORT_ValidationState
  /**
   * Timeout for validation entry
   *
-   * A timeout occured during the validation process
+   * A timeout occurred during the validation process
   */
  GNUNET_TRANSPORT_VS_TIMEOUT,
@@ -1361,7 +1361,7 @@ GST_validation_handle_address (const struct GNUNET_HELLO_Address *address)
  papi = GST_plugins_find (address->transport_name);
  if (NULL == papi)
  {
-    /* This plugin is currently unvailable ... ignore */
+    /* This plugin is currently unavailable ... ignore */
    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                "No plugin available for %s\n",
                address->transport_name);
@@ -1807,7 +1807,7 @@ GST_validation_set_address_use (const struct GNUNET_HELLO_Address *address,
  ve->in_use = in_use;
  if (GNUNET_YES == in_use)
  {
-    /* from now on, higher frequeny, so reschedule now */
+    /* from now on, higher frequency, so reschedule now */
    if (NULL != ve->revalidation_task)
      GNUNET_SCHEDULER_cancel (ve->revalidation_task);
    ve->revalidation_task = GNUNET_SCHEDULER_add_now (&revalidate_address,
diff --git a/src/transport/gnunet-transport-profiler.c b/src/transport/gnunet-transport-profiler.c
index 81678fa20..6e5204e28 100644
--- a/src/transport/gnunet-transport-profiler.c
+++ b/src/transport/gnunet-transport-profiler.c
@@ -204,7 +204,7 @@ shutdown_task (void *cls)
  if (benchmark_send)
  {
-    /* First iteration to calculcate avg and stddev */
+    /* First iteration to calculate avg and stddev */
    iterations = 0;
    avg_duration = 0;
    avg_rate = 0.0;
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index 0d71e1ff9..b5ad43770 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -78,7 +78,7 @@ struct ValidationResolutionContext
  struct GNUNET_TIME_Absolute next_validation;
  /**
-   * Tranport conversion handle
+   * Transport conversion handle
   */
  struct GNUNET_TRANSPORT_AddressToStringContext *asc;
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 219fae57b..18bfcc054 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -639,7 +639,7 @@ client_schedule (struct HTTP_Client_Plugin *plugin,
 #if VERBOSE_CURL
 /**
- * Loggging function
+ * Logging function
 *
 * @param curl the curl easy handle
 * @param type message type
@@ -1306,7 +1306,7 @@ client_run (void *cls)
  int msgs_left;
  plugin->client_perform_task = NULL;
-  /* While data are available or timeouts occured */
+  /* While data are available or timeouts occurred */
  do
  {
    running = 0;
@@ -1390,7 +1390,7 @@ client_run (void *cls)
          break;
        case H_TMP_RECONNECT_REQUIRED:
-          /* Transport called send while disconnect in progess, reconnect */
+          /* Transport called send while disconnect in progress, reconnect */
          if (GNUNET_SYSERR == client_connect_put (s))
          {
            /* Reconnect failed, disconnect session */
@@ -2478,7 +2478,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
  if (NULL == env->receive)
  {
    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialze the plugin or the API */
+       initialize the plugin or the API */
    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
    api->cls = NULL;
    api->address_to_string = &http_client_plugin_address_to_string;
diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c
index 0e3778837..75bf8b74a 100644
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -210,7 +210,7 @@ struct PrettyPrinterContext
  struct GNUNET_SCHEDULER_Task *timeout_task;
  /**
-   * Splitted Address
+   * Split Address
   */
  struct SplittedHTTPAddress *saddr;
@@ -222,7 +222,7 @@ struct PrettyPrinterContext
  /**
   * Was conversion successful
   */
-  int sucess;
+  int success;
  /**
   * Address options
@@ -247,7 +247,7 @@ static struct PrettyPrinterContext *dll_ppc_tail;
 * to override the address again.
 *
 * @param plugin the name of the plugin
- * @param saddr the splitted http address
+ * @param saddr the split http address
 * @param options address options
 * @param dnsresult dns name to include in address
 * @return string representing the same address or NULL on error
@@ -287,12 +287,12 @@ http_common_dns_reverse_lookup_cb (void *cls, const char *hostname)
              http_common_plugin_dnsresult_to_address (ppc->plugin, ppc->saddr,
                                                       ppc->options,
                                                       hostname), GNUNET_OK);
-    ppc->sucess = GNUNET_YES;
+    ppc->success = GNUNET_YES;
  }
  else
  {
    ppc->asc (ppc->asc_cls, NULL,
-              (GNUNET_NO == ppc->sucess) ? GNUNET_SYSERR : GNUNET_OK);
+              (GNUNET_NO == ppc->success) ? GNUNET_SYSERR : GNUNET_OK);
    GNUNET_CONTAINER_DLL_remove (dll_ppc_head, dll_ppc_tail, ppc);
    http_clean_splitted (ppc->saddr);
@@ -355,13 +355,13 @@ http_common_dns_ip_lookup_cb (void *cls,
                                                       GNUNET_a2s (addr,
                                                                   addrlen)),
              GNUNET_OK);
-    ppc->sucess = GNUNET_YES;
+    ppc->success = GNUNET_YES;
    ppc->asc (ppc->asc_cls, GNUNET_a2s (addr, addrlen), GNUNET_OK);
  }
  else
  {
    ppc->asc (ppc->asc_cls, NULL,
-              (GNUNET_NO == ppc->sucess) ? GNUNET_SYSERR : GNUNET_OK);
+              (GNUNET_NO == ppc->success) ? GNUNET_SYSERR : GNUNET_OK);
    GNUNET_CONTAINER_DLL_remove (dll_ppc_head, dll_ppc_tail, ppc);
    GNUNET_free (ppc->plugin);
@@ -383,7 +383,7 @@ http_common_dns_ip_lookup (const char *name,
  struct PrettyPrinterContext *ppc;
  ppc = GNUNET_new (struct PrettyPrinterContext);
-  ppc->sucess = GNUNET_NO;
+  ppc->success = GNUNET_NO;
  ppc->saddr = saddr;
  ppc->asc = asc;
  ppc->asc_cls = asc_cls;
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 6e95ca00c..78b030e9a 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -2569,7 +2569,7 @@ server_remove_address (void *cls,
 *     the previous (now invalid) one
 * @param ac address class the address belongs to
 * @param addr either the previous or the new public IP address
- * @param addrlen actual lenght of the address
+ * @param addrlen actual length of the address
 */
 static void
 server_nat_port_map_callback (void *cls,
@@ -3512,7 +3512,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
  if (NULL == env->receive)
  {
    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialze the plugin or the API */
+       initialize the plugin or the API */
    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
    api->cls = NULL;
    api->address_to_string = &http_server_plugin_address_to_string;
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 8378a64dd..ac4cc672f 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -164,7 +164,7 @@ typedef int (*GNUNET_CONNECTION_AccessCheck) (
 *
 * @param cls closure
 * @param buf pointer to received data
- * @param available number of bytes availabe in "buf",
+ * @param available number of bytes available in "buf",
 *        possibly 0 (on errors)
 * @param addr address of the sender
 * @param addrlen size of addr
@@ -3674,7 +3674,7 @@ libgnunet_plugin_transport_tcp_init (void *cls)
  if (NULL == env->receive)
  {
    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialze the plugin or the API */
+       initialize the plugin or the API */
    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
    api->cls = NULL;
    api->address_pretty_printer = &tcp_plugin_address_pretty_printer;
diff --git a/src/transport/plugin_transport_template.c b/src/transport/plugin_transport_template.c
index 239f32f4a..c39c72178 100644
--- a/src/transport/plugin_transport_template.c
+++ b/src/transport/plugin_transport_template.c
@@ -516,7 +516,7 @@ libgnunet_plugin_transport_template_init (void *cls)
  if (NULL == env->receive)
  {
    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialze the plugin or the API */
+       initialize the plugin or the API */
    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
    api->cls = NULL;
    api->address_to_string = &template_plugin_address_to_string;
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 49e84dfe7..2db31caa3 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -2390,7 +2390,7 @@ read_process_ack (struct Plugin *plugin,
 /**
- * Message tokenizer has broken up an incomming message. Pass it on
+ * Message tokenizer has broken up an incoming message. Pass it on
 * to the service.
 *
 * @param cls the `struct GNUNET_ATS_Session *`
@@ -3605,7 +3605,7 @@ libgnunet_plugin_transport_udp_init (void *cls)
  if (NULL == env->receive)
  {
    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialze the plugin or the API */
+       initialize the plugin or the API */
    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
    api->cls = NULL;
    api->address_pretty_printer = &udp_plugin_address_pretty_printer;
diff --git a/src/transport/plugin_transport_unix.c b/src/transport/plugin_transport_unix.c
index 2324914c9..269949a99 100644
--- a/src/transport/plugin_transport_unix.c
+++ b/src/transport/plugin_transport_unix.c
@@ -1729,7 +1729,7 @@ libgnunet_plugin_transport_unix_init (void *cls)
  if (NULL == env->receive)
  {
    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialze the plugin or the API */
+       initialize the plugin or the API */
    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
    api->cls = NULL;
    api->address_pretty_printer = &unix_plugin_address_pretty_printer;
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index 1b2b6d0d2..138fb5080 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -470,7 +470,7 @@ struct Plugin
  struct GNUNET_TRANSPORT_PluginEnvironment *env;
  /**
-   * Handle to helper process for priviledged operations.
+   * Handle to helper process for privileged operations.
   */
  struct GNUNET_HELPER_Handle *suid_helper;
@@ -2262,7 +2262,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
  if (NULL == env->receive)
  {
    /* run in 'stub' mode (i.e. as part of gnunet-peerinfo), don't fully
-       initialze the plugin or the API */
+       initialize the plugin or the API */
    api = GNUNET_new (struct GNUNET_TRANSPORT_PluginFunctions);
    api->cls = NULL;
    api->address_pretty_printer = &wlan_plugin_address_pretty_printer;
diff --git a/src/transport/tcp_connection_legacy.c b/src/transport/tcp_connection_legacy.c
index 924362ef2..551e79055 100644
--- a/src/transport/tcp_connection_legacy.c
+++ b/src/transport/tcp_connection_legacy.c
@@ -120,7 +120,7 @@ struct AddressProbe
  struct GNUNET_CONNECTION_Handle *connection;
  /**
-   * Lenth of addr.
+   * Length of addr.
   */
  socklen_t addrlen;
@@ -538,7 +538,7 @@ signal_transmit_error (struct GNUNET_CONNECTION_Handle *connection, int ecode)
  GNUNET_CONNECTION_TransmitReadyNotify notify;
  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Transmission encounterd error (%s), connection closed (%p)\n",
+       "Transmission encountered error (%s), connection closed (%p)\n",
       strerror (ecode),
       connection);
  if (NULL != connection->sock)
diff --git a/src/transport/tcp_server_legacy.c b/src/transport/tcp_server_legacy.c
index 59b4fc20a..f4d48d4f6 100644
--- a/src/transport/tcp_server_legacy.c
+++ b/src/transport/tcp_server_legacy.c
@@ -836,7 +836,7 @@ GNUNET_SERVER_destroy (struct GNUNET_SERVER_Handle *server)
 *        incoming messages; the last entry must
 *        have "NULL" for the "callback"; multiple
 *        entries for the same type are allowed,
- *        they will be called in order of occurence.
+ *        they will be called in order of occurrence.
 *        These handlers can be removed later;
 *        the handlers array must exist until removed
 *        (or server is destroyed).
diff --git a/src/transport/tcp_server_mst_legacy.c b/src/transport/tcp_server_mst_legacy.c
index cef41c5b0..bed6874c9 100644
--- a/src/transport/tcp_server_mst_legacy.c
+++ b/src/transport/tcp_server_mst_legacy.c
@@ -262,7 +262,7 @@ do_align:
    else
    {
      /* need to copy to private buffer to align;
-       * yes, we go a bit more spagetti than usual here */
+       * yes, we go a bit more spaghetti than usual here */
      goto do_align;
    }
  }
diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c
index 98b49012a..202bc0a5b 100644
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@ -998,7 +998,7 @@ static void
 do_shutdown (void *cls)
 {
  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "shuting down test.\n");
+       "shutting down test.\n");
  for (unsigned int i = 0; i < NUM_PEERS; i++)
  {
diff --git a/src/transport/test_transport_address_switch.c b/src/transport/test_transport_address_switch.c
index b49cb187b..ce5117bd1 100644
--- a/src/transport/test_transport_address_switch.c
+++ b/src/transport/test_transport_address_switch.c
@@ -77,7 +77,7 @@ struct PeerStats
 static struct PeerStats stats[2];
-/* Amount of data transfered since last switch attempt */
+/* Amount of data transferred since last switch attempt */
 static unsigned long long bytes_sent_after_switch;
 static unsigned long long bytes_recv_after_switch;
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index deb943956..508fed4f5 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -174,7 +174,7 @@ custom_shutdown (void *cls)
  unsigned long long rate;
  int ok;
-  /* Calculcate statistics   */
+  /* Calculate statistics   */
  delta = GNUNET_TIME_absolute_get_duration (start_time).rel_value_us;
  if (0 == delta)
    delta = 1;
diff --git a/src/transport/transport-testing-communicator.c b/src/transport/transport-testing-communicator.c
index 040f16d5d..ce4af01f2 100644
--- a/src/transport/transport-testing-communicator.c
+++ b/src/transport/transport-testing-communicator.c
@@ -431,7 +431,7 @@ handle_queue_create_ok (void *cls,
 /**
- * @brief Communicator informs that it wont try establishing requested queue.
+ * @brief Communicator informs that it won't try establishing requested queue.
 *
 * It will not do so probably because the address is bougus (see comment to
 * #GNUNET_MESSAGE_TYPE_TRANSPORT_QUEUE_CREATE_FAIL)
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 2da193b31..a7ee563d7 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -824,7 +824,7 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct
 /**
 * Cancel the request to connect two peers
- * Tou MUST cancel the request if you stop the peers before the peers connected succesfully
+ * Tou MUST cancel the request if you stop the peers before the peers connected successfully
 *
 * @param tth transport testing handle
 * @param cc a connect request handle
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
index eaa8a5f15..96d305fd8 100644
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@ -859,7 +859,7 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct
 /**
 * Cancel the request to connect two peers
- * Tou MUST cancel the request if you stop the peers before the peers connected succesfully
+ * Tou MUST cancel the request if you stop the peers before the peers connected successfully
 *
 * @param tth transport testing handle
 * @param cc a connect request handle
diff --git a/src/transport/transport_api2_application.c b/src/transport/transport_api2_application.c
index 4862863dd..00f5f62eb 100644
--- a/src/transport/transport_api2_application.c
+++ b/src/transport/transport_api2_application.c
@@ -282,7 +282,7 @@ GNUNET_TRANSPORT_application_done (
 * @param peer identity of the peer we need an address for
 * @param pk what kind of application will the application require (can be
 *         #GNUNET_MQ_PRIO_BACKGROUND, we will still try to connect)
- * @param bw desired bandwith, can be zero (we will still try to connect)
+ * @param bw desired bandwidth, can be zero (we will still try to connect)
 * @return suggest handle, NULL if a request is already pending
 */
 struct GNUNET_TRANSPORT_ApplicationSuggestHandle *
@@ -359,7 +359,7 @@ GNUNET_TRANSPORT_application_suggest_cancel (
 * @param peer identity of the peer we have an address for
 * @param nt network type of @a addr (as claimed by the other peer);
 *        used by TRANSPORT to avoid trying @a addr's that really cannot work
- *        due to network type missmatches
+ *        due to network type mismatches
 * @param addr address to validate
 */
 void
diff --git a/src/transport/transport_api2_communication.c b/src/transport/transport_api2_communication.c
index 3d9da08e4..446add6f6 100644
--- a/src/transport/transport_api2_communication.c
+++ b/src/transport/transport_api2_communication.c
@@ -198,7 +198,7 @@ struct GNUNET_TRANSPORT_CommunicatorHandle
  struct GNUNET_MQ_Handle *mq;
  /**
-   * Maximum permissable queue length.
+   * Maximum permissible queue length.
   */
  unsigned long long max_queue_length;
@@ -262,7 +262,7 @@ struct GNUNET_TRANSPORT_QueueHandle
  struct GNUNET_PeerIdentity peer;
  /**
-   * Network type of the communciation queue.
+   * Network type of the communication queue.
   */
  enum GNUNET_NetworkType nt;
@@ -889,7 +889,7 @@ GNUNET_TRANSPORT_communicator_disconnect (
 *         immediately dropped due to memory limitations (communicator
 *         should try to apply back pressure),
 *         #GNUNET_SYSERR if the message could not be delivered because
- *         the tranport service is not yet up
+ *         the transport service is not yet up
 */
 int
 GNUNET_TRANSPORT_communicator_receive (
diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c
index 7d4b415bd..0ffaeb444 100644
--- a/src/transport/transport_api_core.c
+++ b/src/transport/transport_api_core.c
@@ -82,7 +82,7 @@ struct Neighbour
  struct GNUNET_BANDWIDTH_Tracker out_tracker;
  /**
-   * Entry in our readyness heap (which is sorted by @e next_ready
+   * Entry in our readiness heap (which is sorted by @e next_ready
   * value).  NULL if there is no pending transmission request for
   * this neighbour or if we're waiting for @e is_ready to become
   * true AFTER the @e out_tracker suggested that this peer's quota
diff --git a/src/util/test_strings.c b/src/util/test_strings.c
index 753ec6908..d986486d0 100644
--- a/src/util/test_strings.c
+++ b/src/util/test_strings.c
@@ -41,7 +41,8 @@
 #define URLENCODE_TEST_VECTOR_PLAIN "Asbjlaw=ljsdlasjd?人aslkdsa"
-#define URLENCODE_TEST_VECTOR_ENCODED "Asbjlaw\%3Dljsdlasjd\%3F\%E4\%BA\%BAaslkdsa"
+#define URLENCODE_TEST_VECTOR_ENCODED \
+  "Asbjlaw\%3Dljsdlasjd\%3F\%E4\%BA\%BAaslkdsa"
 int
 main (int argc, char *argv[])
@@ -142,13 +143,16 @@ main (int argc, char *argv[])
  GNUNET_assert (rt.rel_value_us == rtx.rel_value_us);
  GNUNET_assert (0 != GNUNET_STRINGS_urlencode (URLENCODE_TEST_VECTOR_PLAIN,
-                                                strlen (URLENCODE_TEST_VECTOR_PLAIN),
+                                                strlen (
+                                                  URLENCODE_TEST_VECTOR_PLAIN),
                                                &b));
  WANT (URLENCODE_TEST_VECTOR_ENCODED, b);
  GNUNET_free (b);
-  GNUNET_assert (0 != GNUNET_STRINGS_urldecode (URLENCODE_TEST_VECTOR_ENCODED,
+  GNUNET_assert (0 !=
-                                                strlen (URLENCODE_TEST_VECTOR_ENCODED),
+                 GNUNET_STRINGS_urldecode (URLENCODE_TEST_VECTOR_ENCODED,
-                                                &b));
+                                           strlen (
+                                             URLENCODE_TEST_VECTOR_ENCODED),
+                                           &b));
  WANT (URLENCODE_TEST_VECTOR_PLAIN, b);
  GNUNET_free (b);
  return 0;
diff --git a/src/vpn/gnunet-helper-vpn.c b/src/vpn/gnunet-helper-vpn.c
index c693d24ea..7eeb07379 100644
--- a/src/vpn/gnunet-helper-vpn.c
+++ b/src/vpn/gnunet-helper-vpn.c
@@ -77,7 +77,7 @@ struct in6_ifreq
 /**
 * Creates a tun-interface called dev;
 *
- * @param dev is asumed to point to a char[IFNAMSIZ]
+ * @param dev is assumed to point to a char[IFNAMSIZ]
 *        if *dev == '\\0', uses the name supplied by the kernel;
 * @return the fd to the tun or -1 on error
 */
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 4c57438c3..b4233905f 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -235,7 +235,7 @@ struct ChannelState
  struct DestinationEntry destination;
  /**
-   * Addess family used for this channel on the local TUN interface.
+   * Address family used for this channel on the local TUN interface.
   */
  int af;
@@ -1396,7 +1396,7 @@ create_channel (struct ChannelState *ts,
 * @param cls the `struct ChannelState`
 * @param id Peer providing a regex that matches the string.
 * @param get_path Path of the get request.
- * @param get_path_length Lenght of @a get_path.
+ * @param get_path_length Length of @a get_path.
 * @param put_path Path of the put request.
 * @param put_path_length Length of the @a put_path.
 */
diff --git a/src/zonemaster/gnunet-service-zonemaster-monitor.c b/src/zonemaster/gnunet-service-zonemaster-monitor.c
index c6dd2b6ca..7e8c1fb8b 100644
--- a/src/zonemaster/gnunet-service-zonemaster-monitor.c
+++ b/src/zonemaster/gnunet-service-zonemaster-monitor.c
@@ -396,7 +396,7 @@ handle_monitor_error (void *cls)
 /**
- * Performe zonemaster duties: watch namestore, publish records.
+ * Perform zonemaster duties: watch namestore, publish records.
 *
 * @param cls closure
 * @param server the initialized server
diff --git a/src/zonemaster/gnunet-service-zonemaster.c b/src/zonemaster/gnunet-service-zonemaster.c
index 11fa9921d..2957cfee2 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -821,7 +821,7 @@ publish_zone_dht_start (void *cls)
 /**
- * Performe zonemaster duties: watch namestore, publish records.
+ * Perform zonemaster duties: watch namestore, publish records.
 *
 * @param cls closure
 * @param server the initialized server