-fix conflict

35 files changed, 57 insertions, 419 deletions

diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index 2a5290bf9..4820caf70 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -981,7 +981,7 @@ queue_destroy (struct Queue *queue)
  * @param[in,out] hmac_secret secret for HMAC calculation
  * @param buf buffer to MAC
  * @param buf_size number of bytes in @a buf
- * @param smac[out] where to write the HMAC
+ * @param[out] smac where to write the HMAC
  */
 static void
 calculate_hmac (struct GNUNET_HashCode *hmac_secret,
@@ -1155,8 +1155,8 @@ pass_plaintext_to_core (struct Queue *queue,
  *
  * @param dh shared secret
  * @param pid decrypting peer's identity
- * @param cipher[out] cipher to initialize
- * @param hmac_key[out] HMAC key to initialize
+ * @param[out] cipher cipher to initialize
+ * @param[out] hmac_key HMAC key to initialize
  */
 static void
 setup_cipher (const struct GNUNET_HashCode *dh,
@@ -1287,7 +1287,7 @@ rekey_monotime_cb (void *cls,
  * Setup cipher of @a queue for decryption.
  *
  * @param ephemeral ephemeral key we received from the other peer
- * @param queue[in,out] queue to initialize decryption cipher for
+ * @param[in,out] queue queue to initialize decryption cipher for
  */
 static void
 setup_in_cipher (const struct GNUNET_CRYPTO_EcdhePublicKey *ephemeral,
@@ -1448,8 +1448,8 @@ handshake_ack_monotime_cb (void *cls,
  * @param queue The queue context.
  */
 static void
-send_challenge (struct GNUNET_CRYPTO_ChallengeNonceP challenge, struct
-                Queue *queue)
+send_challenge (struct GNUNET_CRYPTO_ChallengeNonceP challenge, 
+                struct Queue *queue)
 {
   struct TCPConfirmationAck tca;
   struct TcpHandshakeAckSignature thas;
@@ -2613,7 +2613,7 @@ handshake_monotime_cb (void *cls,
  * Note that #setup_in_cipher() must have already been called.
  *
  * @param queue queue to decrypt initial bytes from other peer for
- * @param tc[out] where to store the result
+ * @param[out] tc where to store the result
  * @param ibuf incoming data, of size
  *        `INITIAL_KX_SIZE`
  * @return #GNUNET_OK if the signature was OK, #GNUNET_SYSERR if not
@@ -3179,7 +3179,7 @@ enc_notify_cb (void *cls,
  * a function to call whenever our set of 'valid' addresses changes.
  *
  * @param cls closure
- * @param app_ctx[in,out] location where the app can store stuff
+ * @param[in,out] app_ctx location where the app can store stuff
  *                  on add and retrieve it on remove
  * @param add_remove #GNUNET_YES to add a new public IP address,
  *                   #GNUNET_NO to remove a previous (now invalid) one
diff --git a/src/transport/gnunet-communicator-udp.c b/src/transport/gnunet-communicator-udp.c
index 07beeac38..2748a6594 100644
--- a/src/transport/gnunet-communicator-udp.c
+++ b/src/transport/gnunet-communicator-udp.c
@@ -998,7 +998,7 @@ kce_destroy (struct KeyCacheEntry *kce)
  *
  * @param msec master secret for HMAC calculation
  * @param serial number for the @a smac calculation
- * @param kid[out] where to write the key ID
+ * @param[out] kid where to write the key ID
  */
 static void
 get_kid (const struct GNUNET_HashCode *msec,
@@ -1130,8 +1130,8 @@ 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 decryption key
- * @param iv[out] where to write the IV
+ * @param[out] key where to write the decryption key
+ * @param[out] iv where to write the IV
  */
 static void
 get_iv_key (const struct GNUNET_HashCode *msec,
@@ -1237,7 +1237,7 @@ check_timeouts (void *cls)
 /**
  * Calculate cmac from master in @a ss.
  *
- * @param ss[in,out] data structure to complete
+ * @param[in,out] ss data structure to complete
  */
 static void
 calculate_cmac (struct SharedSecret *ss)
@@ -1397,7 +1397,7 @@ setup_shared_secret_dec (const struct GNUNET_CRYPTO_EcdhePublicKey *ephemeral)
  * Setup shared secret for encryption.
  *
  * @param ephemeral ephemeral key we are sending to the other peer
- * @param receiver[in,out] queue to initialize encryption key for
+ * @param[in,out] receiver queue to initialize encryption key for
  * @return new shared secret
  */
 static struct SharedSecret *
@@ -2198,7 +2198,7 @@ setup_sender (const struct GNUNET_PeerIdentity *target,
 /**
  * Check signature from @a uc against @a ephemeral.
  *
- * @param ephermal key that is signed
+ * @param ephemeral key that is signed
  * @param uc signature of claimant
  * @return #GNUNET_OK if signature is valid
  */
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c
index ae4d65bcf..5976bd5b1 100644
--- a/src/transport/gnunet-service-tng.c
+++ b/src/transport/gnunet-service-tng.c
@@ -3296,7 +3296,7 @@ struct MonitorEvent
 
 
 /**
- * Free a @dvh. Callers MAY want to check if this was the last path to the
+ * Free a @a dvh. Callers MAY want to check if this was the last path to the
  * `target`, and if so call #free_dv_route to also free the associated DV
  * entry in #dv_routes (if not, the associated scheduler job should eventually
  * take care of it).
@@ -4136,7 +4136,7 @@ client_send_response (struct PendingMessage *pm)
  *
  * @param dv data structure to pick paths from
  * @param options constraints to satisfy
- * @param hops_array[out] set to the result
+ * @param[out] hops_array set to the result
  * @param hops_array_length length of the @a hops_array
  * @return number of entries set in @a hops_array
  */
@@ -4404,7 +4404,7 @@ check_communicator_backchannel (
  * Ensure ephemeral keys in our @a dv are current. If no current one exists,
  * set it up.
  *
- * @param dv[in,out] virtual link to update ephemeral for
+ * @param[in,out] dv virtual link to update ephemeral for
  */
 static void
 update_ephemeral (struct DistanceVector *dv)
@@ -4637,7 +4637,7 @@ struct DVKeyState
  *
  * @param km raw master secret
  * @param iv initialization vector
- * @param key[out] symmetric cipher and HMAC state to generate
+ * @param[out] key symmetric cipher and HMAC state to generate
  */
 static void
 dv_setup_key_state_from_km (const struct GNUNET_HashCode *km,
@@ -4679,7 +4679,7 @@ dv_setup_key_state_from_km (const struct GNUNET_HashCode *km,
  * @param priv_ephemeral ephemeral private key to use
  * @param target the target peer to encrypt to
  * @param iv unique IV to use
- * @param key[out] set to the key material
+ * @param[out] key set to the key material
  */
 static void
 dh_key_derive_eph_pid (
@@ -4704,7 +4704,7 @@ dh_key_derive_eph_pid (
  * @param priv_ephemeral ephemeral private key to use
  * @param target the target peer to encrypt to
  * @param iv unique IV to use
- * @param key[out] set to the key material
+ * @param[out] key set to the key material
  */
 static void
 dh_key_derive_eph_pub (const struct GNUNET_CRYPTO_EcdhePublicKey *pub_ephemeral,
@@ -4725,7 +4725,7 @@ dh_key_derive_eph_pub (const struct GNUNET_CRYPTO_EcdhePublicKey *pub_ephemeral,
  * material from @a key.
  *
  * @param key key material (from DH)
- * @param hmac[out] set to the HMAC
+ * @param[out] hmac set to the HMAC
  * @param data data to perform HMAC calculation over
  * @param data_size number of bytes in @a data
  */
@@ -4743,7 +4743,7 @@ dv_hmac (const struct DVKeyState *key,
  * Perform backchannel encryption using symmetric secret in @a key
  * to encrypt data from @a in to @a dst.
  *
- * @param key[in,out] key material to use
+ * @param[in,out] key key material to use
  * @param dst where to write the result
  * @param in input data to encrypt (plaintext)
  * @param in_size number of bytes of input in @a in and available at @a dst
@@ -4760,9 +4760,9 @@ dv_encrypt (struct DVKeyState *key, const void *in, void *dst, size_t in_size)
  * Perform backchannel encryption using symmetric secret in @a key
  * to encrypt data from @a in to @a dst.
  *
- * @param key[in,out] key material to use
+ * @param[in,out] key key material to use
  * @param ciph cipher text to decrypt
- * @param out[out] output data to generate (plaintext)
+ * @param[out] out output data to generate (plaintext)
  * @param out_size number of bytes of input in @a ciph and available in @a out
  */
 static void
@@ -4815,7 +4815,7 @@ typedef void (*DVMessageHandler) (void *cls,
  * @param use function to call with the encapsulated message
  * @param use_cls closure for @a use
  * @param options whether path must be confirmed or not, to be passed to @a use
- * @param shall this TransportDVBoxMessage be forwarded without flow control.
+ * @param without_fc shall this TransportDVBoxMessage be forwarded without flow control.
  * @return expected RTT for transmission, #GNUNET_TIME_UNIT_FOREVER_REL if sending failed
  */
 static struct GNUNET_TIME_Relative
@@ -6274,7 +6274,7 @@ handle_reliability_box (void *cls,
  * so, purge ancient statistics (more than GOODPUT_AGING_SLOTS before
  * the current age)
  *
- * @param pd[in,out] data to update
+ * @param[in,out] pd data to update
  * @param age current age
  */
 static void
@@ -6300,7 +6300,7 @@ update_pd_age (struct PerformanceData *pd, unsigned int age)
  * Update @a pd based on the latest @a rtt and the number of bytes
  * that were confirmed to be successfully transmitted.
  *
- * @param pd[in,out] data to update
+ * @param[in,out] pd data to update
  * @param rtt latest round-trip time
  * @param bytes_transmitted_ok number of bytes receiver confirmed as received
  */
@@ -7817,7 +7817,7 @@ check_dv_box (void *cls, const struct TransportDVBoxMessage *dvb)
 
 /**
  * Create a DV Box message and queue it for transmission to
- * @ea next_hop.
+ * @a next_hop.
  *
  * @param next_hop peer to receive the message next
  * @param total_hops how many hops did the message take so far
@@ -8371,7 +8371,7 @@ handle_dv_box (void *cls, const struct TransportDVBoxMessage *dvb)
  * Client notified us about transmission from a peer.  Process the request.
  *
  * @param cls a `struct TransportClient` which sent us the message
- * @param obm the send message that was sent
+ * @param im the send message that was sent
  * @return #GNUNET_YES if message is well-formed
  */
 static int
@@ -9597,7 +9597,7 @@ struct PendingMessageScoreContext
  * Select the best pending message from @a vl for transmission
  * via @a queue.
  *
- * @param sc[in,out] best message so far (NULL for none), plus scoring data
+ * @param[in,out] sc best message so far (NULL for none), plus scoring data
  * @param queue the queue that will be used for transmission
  * @param vl the virtual link providing the messages
  * @param dvh path we are currently considering, or NULL for none
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 345a0d949..93790e293 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -2120,7 +2120,7 @@ free_blacklist_entry (void *cls,
  * Set traffic metric to manipulate
  *
  * @param cls closure
- * @param message containing information
+ * @param tm message containing information
  */
 static void
 handle_client_set_metric (void *cls, const struct TrafficMetricMessage *tm)
@@ -2486,11 +2486,6 @@ GST_blacklist_test_allowed (const struct GNUNET_PeerIdentity *peer,
 }
 
 
-/**
- * Cancel a blacklist check.
- *
- * @param bc check to cancel
- */
 void
 GST_blacklist_test_cancel (struct GST_BlacklistCheck *bc)
 {
diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c
index 130311e15..2438a0a48 100644
--- a/src/transport/gnunet-service-transport_ats.c
+++ b/src/transport/gnunet-service-transport_ats.c
@@ -477,13 +477,6 @@ GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address,
 }
 
 
-/**
- * Notify ATS about the new address including the network this address is
- * located in.  The address must NOT be inbound and must be new to ATS.
- *
- * @param address the address
- * @param prop performance information
- */
 void
 GST_ats_add_address (const struct GNUNET_HELLO_Address *address,
                      const struct GNUNET_ATS_Properties *prop)
@@ -755,13 +748,6 @@ GST_ats_update_distance (const struct GNUNET_HELLO_Address *address,
 }
 
 
-/**
- * Notify ATS about @a delay changes to properties of an @a address.
- * Does nothing if the @a address is not known to us.
- *
- * @param address the address
- * @param delay new delay value
- */
 void
 GST_ats_update_delay (const struct GNUNET_HELLO_Address *address,
                       struct GNUNET_TIME_Relative delay)
diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h
index d536714ec..ca972d1cc 100644
--- a/src/transport/gnunet-service-transport_ats.h
+++ b/src/transport/gnunet-service-transport_ats.h
@@ -110,7 +110,7 @@ GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address,
 
 
 /**
- * Notify ATS about a new address including the network this address is
+ * Notify ATS about a new address including the network the address is
  * located in.  The address must NOT be inbound and must be new to ATS.
  *
  * @param address the address
@@ -154,7 +154,6 @@ GST_ats_update_utilization (const struct GNUNET_HELLO_Address *address,
  * Does nothing if the @a address is not known to us.
  *
  * @param address the address
- * @param session the session
  * @param delay new delay value
  */
 void
diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c
index 472c77c27..1e5e8a225 100644
--- a/src/transport/gnunet-service-transport_hello.c
+++ b/src/transport/gnunet-service-transport_hello.c
@@ -334,16 +334,6 @@ GST_hello_modify_addresses (int addremove,
 }
 
 
-/**
- * Test if a particular address is one of ours.
- *
- * @param address address to test
- * @param sig location where to cache PONG signatures for this address [set]
- * @param sig_expiration how long until the current 'sig' expires?
- *            (ZERO if sig was never created) [set]
- * @return #GNUNET_YES if this is one of our addresses,
- *         #GNUNET_NO if not
- */
 int
 GST_hello_test_address (const struct GNUNET_HELLO_Address *address,
                         struct GNUNET_CRYPTO_EddsaSignature **sig,
diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c
index 04d1774c0..9f39b2dca 100644
--- a/src/transport/gnunet-service-transport_manipulation.c
+++ b/src/transport/gnunet-service-transport_manipulation.c
@@ -168,7 +168,7 @@ static struct GNUNET_SCHEDULER_Task *generic_send_delay_task;
 /**
  * Set traffic metric to manipulate
  *
- * @param message containing information
+ * @param tm message containing information
  */
 void
 GST_manipulation_set_metric (const struct TrafficMetricMessage *tm)
@@ -349,7 +349,7 @@ GST_manipulation_send (const struct GNUNET_PeerIdentity *target,
  *
  * @param address binary address
  * @param session the session
- * @param prop[IN|OUT] metrics to modify
+ * @param[in,out] prop metrics to modify
  */
 void
 GST_manipulation_manipulate_metrics (const struct GNUNET_HELLO_Address *address,
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c
index ca1b4d1da..e61441d9f 100644
--- a/src/transport/gnunet-service-transport_neighbours.c
+++ b/src/transport/gnunet-service-transport_neighbours.c
@@ -1768,16 +1768,6 @@ GST_neighbours_calculate_receive_delay (const struct
 }
 
 
-/**
- * Transmit a message to the given target using the active connection.
- *
- * @param target destination
- * @param msg message to send
- * @param msg_size number of bytes in msg
- * @param timeout when to fail with timeout
- * @param cont function to call when done
- * @param cont_cls closure for @a cont
- */
 void
 GST_neighbours_send (const struct GNUNET_PeerIdentity *target,
                      const void *msg,
@@ -3019,13 +3009,6 @@ GST_neighbours_notify_data_sent (const struct GNUNET_HELLO_Address *address,
 }
 
 
-/**
- * Master task run for every neighbour.  Performs all of the time-related
- * activities (keep alive, send next message, disconnect if idle, finish
- * clean up after disconnect).
- *
- * @param cls the 'struct NeighbourMapEntry' for which we are running
- */
 static void
 master_task (void *cls)
 {
@@ -3646,13 +3629,6 @@ delayed_disconnect (void *cls)
 }
 
 
-/**
- * We received a quota message from the given peer,
- * validate and process.
- *
- * @param peer sender of the message
- * @param msg the quota message
- */
 void
 GST_neighbours_handle_quota_message (const struct GNUNET_PeerIdentity *peer,
                                      const struct GNUNET_MessageHeader *msg)
diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h
index 13aeab4e6..7ce911aa1 100644
--- a/src/transport/gnunet-service-transport_neighbours.h
+++ b/src/transport/gnunet-service-transport_neighbours.h
@@ -292,7 +292,7 @@ GST_neighbour_get_current_address (const struct GNUNET_PeerIdentity *peer);
 
 
 /**
- * We received a quoat message from the given peer,
+ * We received a quota message from the given peer,
  * validate and process.
  *
  * @param peer sender of the message
diff --git a/src/transport/gnunet-service-transport_plugins.c b/src/transport/gnunet-service-transport_plugins.c
index c88532806..218ef80ab 100644
--- a/src/transport/gnunet-service-transport_plugins.c
+++ b/src/transport/gnunet-service-transport_plugins.c
@@ -83,7 +83,6 @@ static struct TransportPlugin *plugins_tail;
  *
  * @param cls closure
  * @param address address to update metrics for
- * @param session the session
  * @param distance new distance
  */
 static void
@@ -121,18 +120,6 @@ plugin_env_address_to_type (void *cls,
 }
 
 
-/**
- * Load and initialize all plugins.  The respective functions will be
- * invoked by the plugins when the respective events happen.  The
- * closure will be set to a 'const char*' containing the name of the
- * plugin that caused the call.
- *
- * @param recv_cb function to call when data is received
- * @param address_cb function to call when our public addresses changed
- * @param session_start_cb function to call when a session was created
- * @param session_end_cb function to call when a session was terminated
- * @param address_type_cb function to call when a address type is requested
- */
 void
 GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
                   GNUNET_TRANSPORT_AddressNotification address_cb,
@@ -431,12 +418,6 @@ GST_plugins_a2s (const struct GNUNET_HELLO_Address *address)
 }
 
 
-/**
- * Register callback with all plugins to monitor their status.
- *
- * @param cb callback to register, NULL to unsubscribe
- * @param cb_cls closure for @a cb
- */
 void
 GST_plugins_monitor_subscribe (GNUNET_TRANSPORT_SessionInfoCallback cb,
                                void *cb_cls)
diff --git a/src/transport/gnunet-service-transport_plugins.h b/src/transport/gnunet-service-transport_plugins.h
index 0e69da074..fdd819fc5 100644
--- a/src/transport/gnunet-service-transport_plugins.h
+++ b/src/transport/gnunet-service-transport_plugins.h
@@ -40,13 +40,9 @@
  * plugin that caused the call.
  *
  * @param recv_cb function to call when data is received
- * @param register_quota_cb function to call to register a quota callback
- * @param unregister_quota_cb function to call to unregister a quota callback
  * @param address_cb function to call when our public addresses changed
  * @param session_start_cb function to call when a session was created
  * @param session_end_cb function to call when a session was terminated
- * @param address_type_cb function to call when a address type is requested
- * @param metric_update_cb function to call when address metrics change
  */
 void
 GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb,
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 476a3cd52..82468992b 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -556,7 +556,6 @@ client_reschedule_session_timeout (struct GNUNET_ATS_Session *s)
  * Task performing curl operations
  *
  * @param cls plugin as closure
- * @param tc gnunet scheduler task context
  */
 static void
 client_run (void *cls);
@@ -1289,11 +1288,6 @@ client_receive (void *stream,
 }
 
 
-/**
- * Task performing curl operations
- *
- * @param cls plugin as closure
- */
 static void
 client_run (void *cls)
 {
diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c
index 75bf8b74a..40353daeb 100644
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -407,20 +407,6 @@ http_common_dns_ip_lookup (const char *name,
 }
 
 
-/**
- * Convert the transports address to a nice, human-readable
- * format.
- *
- * @param cls closure
- * @param type name of the transport that generated the address
- * @param addr one of the addresses of the host, NULL for the last address
- *        the specific address format depends on the transport
- * @param addrlen length of the @a addr
- * @param numeric should (IP) addresses be displayed in numeric form?
- * @param timeout after how long should we give up?
- * @param asc function to call on each string
- * @param asc_cls closure for @a asc
- */
 void
 http_common_plugin_address_pretty_printer (void *cls, const char *type,
                                            const void *addr,
@@ -597,17 +583,6 @@ http_common_plugin_address_to_url (void *cls,
 }
 
 
-/**
- * Function called for a quick conversion of the binary address to
- * a numeric address.  Note that the caller must not free the
- * address and that the next call to this function is allowed
- * to override the address again.
- *
- * @param plugin the name of the plugin
- * @param addr binary address
- * @param addrlen length of the address
- * @return string representing the same address
- */
 const char *
 http_common_plugin_address_to_string (const char *plugin,
                                       const void *addr,
@@ -642,18 +617,6 @@ http_common_plugin_address_to_string (const char *plugin,
 }
 
 
-/**
- * Function called to convert a string address to
- * a binary address.
- *
- * @param cls closure ('struct Plugin*')
- * @param addr string address
- * @param addrlen length of the @a addr
- * @param buf location to store the buffer
- *        If the function returns #GNUNET_SYSERR, its contents are undefined.
- * @param added length of created address
- * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
- */
 int
 http_common_plugin_string_to_address (void *cls,
                                       const char *addr,
@@ -721,14 +684,6 @@ http_common_plugin_string_to_address (void *cls,
 }
 
 
-/**
- * Create a HTTP address from a socketaddr
- *
- * @param protocol protocol
- * @param addr sockaddr * address
- * @param addrlen length of the address
- * @return the HttpAddress
- */
 struct HttpAddress *
 http_common_address_from_socket (const char *protocol,
                                  const struct sockaddr *addr,
diff --git a/src/transport/plugin_transport_http_common.h b/src/transport/plugin_transport_http_common.h
index 299dc0e68..7a532249d 100644
--- a/src/transport/plugin_transport_http_common.h
+++ b/src/transport/plugin_transport_http_common.h
@@ -137,7 +137,7 @@ http_split_address (const char *addr);
  * @param type name of the transport that generated the address
  * @param addr one of the addresses of the host, NULL for the last address
  *        the specific address format depends on the transport
- * @param addrlen length of the address
+ * @param addrlen length of @a addr
  * @param numeric should (IP) addresses be displayed in numeric form?
  * @param timeout after how long should we give up?
  * @param asc function to call on each string
@@ -178,7 +178,7 @@ http_common_plugin_address_to_string (const char *plugin,
  *
  * @param cls closure (`struct Plugin*`)
  * @param addr string address
- * @param addrlen length of the address
+ * @param addrlen length of @a addr
  * @param buf location to store the buffer
  *        If the function returns #GNUNET_SYSERR, its contents are undefined.
  * @param added length of created address
@@ -198,7 +198,7 @@ http_common_plugin_string_to_address (void *cls,
  * @param protocol protocol
  * @param addr `sockaddr *` address
  * @param addrlen length of the @a addr
- * @return the string
+ * @return A pointer to a `struct HttpAddress` derived from @a addr
  */
 struct HttpAddress *
 http_common_address_from_socket (const char *protocol,
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 78b030e9a..3ad2356b0 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -2563,7 +2563,7 @@ server_remove_address (void *cls,
  * Our external IP address/port mapping has changed.
  *
  * @param cls closure, the 'struct LocalAddrList'
- * @param app_ctx[in,out] location where the app can store stuff
+ * @param[in,out] app_ctx location where the app can store stuff
  *                  on add and retrieve it on remove
  * @param add_remove #GNUNET_YES to mean the new public IP address, #GNUNET_NO to mean
  *     the previous (now invalid) one
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index ac4cc672f..ceae64709 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -1418,7 +1418,7 @@ notify_session_monitor (struct Plugin *plugin,
  * Our external IP address/port mapping has changed.
  *
  * @param cls closure, the `struct Plugin`
- * @param app_ctx[in,out] location where the app can store stuff
+ * @param[in,out] app_ctx location where the app can store stuff
  *                  on add and retrieve it on remove
  * @param add_remove #GNUNET_YES to mean the new public IP address, #GNUNET_NO to mean
  *     the previous (now invalid) one
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 2db31caa3..0d3ca449d 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -1254,7 +1254,7 @@ udp_plugin_check_address (void *cls, const void *addr, size_t addrlen)
  * Our external IP address/port mapping has changed.
  *
  * @param cls closure, the `struct Plugin`
- * @param app_ctx[in,out] location where the app can store stuff
+ * @param[in,out] app_ctx location where the app can store stuff
  *                  on add and retrieve it on remove
  * @param add_remove #GNUNET_YES to mean the new public IP address,
  *                   #GNUNET_NO to mean the previous (now invalid) one
diff --git a/src/transport/tcp_server_legacy.c b/src/transport/tcp_server_legacy.c
index f4d48d4f6..bb572c843 100644
--- a/src/transport/tcp_server_legacy.c
+++ b/src/transport/tcp_server_legacy.c
@@ -699,11 +699,6 @@ GNUNET_SERVER_suspend (struct GNUNET_SERVER_Handle *server)
 }
 
 
-/**
- * Resume accepting connections from the listen socket.
- *
- * @param server server to stop accepting connections.
- */
 void
 GNUNET_SERVER_resume (struct GNUNET_SERVER_Handle *server)
 {
@@ -1620,21 +1615,6 @@ transmit_ready_callback_wrapper (void *cls, size_t size, void *buf)
 }
 
 
-/**
- * Notify us when the server has enough space to transmit
- * a message of the given size to the given client.
- *
- * @param client client to transmit message to
- * @param size requested amount of buffer space
- * @param timeout after how long should we give up (and call
- *        notify with buf NULL and size 0)?
- * @param callback function to call when space is available
- * @param callback_cls closure for @a callback
- * @return non-NULL if the notify callback was queued; can be used
- *         to cancel the request using
- *         #GNUNET_SERVER_notify_transmit_ready_cancel().
- *         NULL if we are already going to notify someone else (busy)
- */
 struct GNUNET_SERVER_TransmitHandle *
 GNUNET_SERVER_notify_transmit_ready (struct GNUNET_SERVER_Client *client,
                                      size_t size,
diff --git a/src/transport/transport-testing-cmds.h b/src/transport/transport-testing-cmds.h
index 5a3fb22d6..c577feb34 100644
--- a/src/transport/transport-testing-cmds.h
+++ b/src/transport/transport-testing-cmds.h
@@ -227,9 +227,9 @@ GNUNET_TRANSPORT_cmd_stop_peer (const char *label,
  *
  * @param label name for command
  * @param start_peer_label Label of the cmd to start a peer.
- * @param create_peer_label Label of the cmd which started the test system.
+ * @param create_label Label of the cmd which started the test system.
  * @param num Number globally identifying the node.
- * @param The topology for the test setup.
+ * @param topology The topology for the test setup.
  * @param additional_connects Number of additional connects this cmd will wait for not triggered by this cmd.
  * @return command.
  */
@@ -248,9 +248,9 @@ GNUNET_TRANSPORT_cmd_connect_peers (
  *
  * @param label name for command.
  * @param start_peer_label Label of the cmd to start a peer.
- * @param create_peer_label Label of the cmd which started the test system.
+ * @param create_label Label of the cmd which started the test system.
  * @param num Number globally identifying the node.
- * @param The topology for the test setup.
+ * @param topology The topology for the test setup.
  * @return command.
  */
 struct GNUNET_TESTING_Command
@@ -271,7 +271,7 @@ GNUNET_TRANSPORT_cmd_send_simple (const char *label,
  * @param num Number globally identifying the node.
  * @param node_n The number of the node in a network namespace.
  * @param namespace_n The number of the network namespace.
- * @param The topology for the test setup.
+ * @param topology The topology for the test setup.
  * @return command.
  */
 struct GNUNET_TESTING_Command
diff --git a/src/transport/transport-testing-communicator.c b/src/transport/transport-testing-communicator.c
index ce4af01f2..1bf88bb3d 100644
--- a/src/transport/transport-testing-communicator.c
+++ b/src/transport/transport-testing-communicator.c
@@ -232,7 +232,7 @@ check_communicator_backchannel (void *cls,
  * Pass the message to the client.
  *
  * @param cls Closure - communicator handle
- * @param msg Message
+ * @param bc_msg Message
  */
 static void
 handle_communicator_backchannel (void *cls,
@@ -283,7 +283,7 @@ handle_communicator_backchannel (void *cls,
  * Address of our peer added.  Test message is well-formed.
  *
  * @param cls the client
- * @param aam the send message that was sent
+ * @param msg the send message that was sent
  * @return #GNUNET_OK if message is well-formed
  */
 static int
@@ -365,7 +365,7 @@ check_incoming_msg (void *cls,
  * Pass the message to the client.
  *
  * @param cls Closure - communicator handle
- * @param msg Message
+ * @param inc_msg Message
  */
 static void
 handle_incoming_msg (void *cls,
@@ -1146,15 +1146,6 @@ GNUNET_TRANSPORT_TESTING_transport_communicator_open_queue (
 }
 
 
-/**
- * @brief Instruct communicator to send data
- *
- * @param tc_queue The queue to use for sending
- * @param cont function to call when done sending
- * @param cont_cls closure for @a cont
- * @param payload Data to send
- * @param payload_size Size of the @a payload
- */
 void
 GNUNET_TRANSPORT_TESTING_transport_communicator_send
   (struct GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h,
diff --git a/src/transport/transport-testing-filenames.c b/src/transport/transport-testing-filenames.c
index 7c136b690..70c1ee55a 100644
--- a/src/transport/transport-testing-filenames.c
+++ b/src/transport/transport-testing-filenames.c
@@ -61,13 +61,6 @@ extract_filename (const char *file)
 }
 
 
-/**
- * Extracts the test filename from an absolute file name and removes
- * the extension
- *
- * @param file absolute file name
- * @return the result
- */
 char *
 GNUNET_TRANSPORT_TESTING_get_test_name (const char *file)
 {
@@ -96,12 +89,6 @@ GNUNET_TRANSPORT_TESTING_get_test_name (const char *file)
 }
 
 
-/**
- * Extracts the filename from an absolute file name and removes the extension
- *
- * @param file absolute file name
- * @return the result
- */
 char *
 GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file)
 {
@@ -115,13 +102,6 @@ GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file)
 }
 
 
-/**
- * Extracts the plugin name from an absolute file name and the test name
- *
- * @param file absolute file name
- * @param test test name
- * @return the result
- */
 char *
 GNUNET_TRANSPORT_TESTING_get_test_plugin_name (const char *file,
                                                const char *test)
@@ -161,14 +141,6 @@ suc:
 }
 
 
-/**
- * This function takes the filename (e.g. argv[0), removes a "lt-"-prefix and
- * if existing ".exe"-prefix and adds the peer-number
- *
- * @param file filename of the test, e.g. argv[0]
- * @param count peer number
- * @return the result
- */
 char *
 GNUNET_TRANSPORT_TESTING_get_config_name (const char *file,
                                           int count)
diff --git a/src/transport/transport-testing-main.c b/src/transport/transport-testing-main.c
index 20c58eeee..8d1727d77 100644
--- a/src/transport/transport-testing-main.c
+++ b/src/transport/transport-testing-main.c
@@ -253,7 +253,7 @@ my_nc (void *cls,
  *
  * @param cls our `struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *`
  * @param peer peer we got disconnected from
- * @param custom_cls return value from @my_nc
+ * @param custom_cls return value from @a my_nc
  */
 static void
 my_nd (void *cls,
diff --git a/src/transport/transport-testing-main2.c b/src/transport/transport-testing-main2.c
index 62aa3ceb7..de0b7f4cd 100644
--- a/src/transport/transport-testing-main2.c
+++ b/src/transport/transport-testing-main2.c
@@ -253,7 +253,7 @@ my_nc (void *cls,
  *
  * @param cls our `struct GNUNET_TRANSPORT_TESTING_InternalPeerContext *`
  * @param peer peer we got disconnected from
- * @param custom_cls return value from @my_nc
+ * @param custom_cls return value from @a my_nc
  */
 static void
 my_nd (void *cls,
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
index 6d41ec098..f0dee7388 100644
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@ -379,19 +379,6 @@ retrieve_hello (void *cls)
 }
 
 
-/**
- * Start a peer with the given configuration
- * @param tth the testing handle
- * @param cfgname configuration file
- * @param peer_id a unique number to identify the peer
- * @param handlers functions for receiving messages
- * @param nc connect callback
- * @param nd disconnect callback
- * @param cb_cls closure for callback
- * @param start_cb start callback
- * @param start_cb_cls closure for callback
- * @return the peer context
- */
 struct GNUNET_TRANSPORT_TESTING_PeerContext *
 GNUNET_TRANSPORT_TESTING_start_peer (struct
                                      GNUNET_TRANSPORT_TESTING_Handle *tth,
@@ -545,14 +532,6 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct
 }
 
 
-/**
- * Stops and restarts the given peer, sleeping (!) for 5s in between.
- *
- * @param p the peer
- * @param restart_cb callback to call when restarted
- * @param restart_cb_cls callback closure
- * @return #GNUNET_OK in success otherwise #GNUNET_SYSERR
- */
 int
 GNUNET_TRANSPORT_TESTING_restart_peer (struct
                                        GNUNET_TRANSPORT_TESTING_PeerContext *p,
@@ -751,11 +730,6 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct
    }*/
 
 
-/**
- * Offer the current HELLO of P2 to P1.
- *
- * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequest`
- */
 static void
 offer_hello (void *cls)
 {
@@ -859,13 +833,6 @@ 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 successfully
- *
- * @param tth transport testing handle
- * @param cc a connect request handle
- */
 void
 GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct
                                                GNUNET_TRANSPORT_TESTING_ConnectRequest
diff --git a/src/transport/transport-testing2.h b/src/transport/transport-testing2.h
index e2167ca7e..b5db28500 100644
--- a/src/transport/transport-testing2.h
+++ b/src/transport/transport-testing2.h
@@ -288,7 +288,7 @@ GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_Handle *tth);
  *
  * @param tth the testing handle
  * @param cfgname configuration file
- * @param peer_id the peer_id
+ * @param peer_id an identification number for the peer
  * @param handlers functions for receiving messages
  * @param nc connect callback
  * @param nd disconnect callback
diff --git a/src/transport/transport_api2_communication.c b/src/transport/transport_api2_communication.c
index 5bcfb30c7..b79f0d8bf 100644
--- a/src/transport/transport_api2_communication.c
+++ b/src/transport/transport_api2_communication.c
@@ -802,24 +802,6 @@ reconnect (struct GNUNET_TRANSPORT_CommunicatorHandle *ch)
 }
 
 
-/**
- * Connect to the transport service.
- *
- * @param cfg configuration to use
- * @param config_section section of the configuration to use for options
- * @param addr_prefix address prefix for addresses supported by this
- *        communicator, could be NULL for incoming-only communicators
- * @param cc what characteristics does the communicator have?
- * @param mtu maximum message size supported by communicator, 0 if
- *            sending is not supported, SIZE_MAX for no MTU
- * @param mq_init function to call to initialize a message queue given
- *                the address of another peer, can be NULL if the
- *                communicator only supports receiving messages
- * @param mq_init_cls closure for @a mq_init
- * @param notify_cb function to pass backchannel messages to communicator
- * @param notify_cb_cls closure for @a notify_cb
- * @return NULL on error
- */
 struct GNUNET_TRANSPORT_CommunicatorHandle *
 GNUNET_TRANSPORT_communicator_connect (
   const struct GNUNET_CONFIGURATION_Handle *cfg,
@@ -880,26 +862,6 @@ GNUNET_TRANSPORT_communicator_disconnect (
 /* ************************* Receiving *************************** */
 
 
-/**
- * Notify transport service that the communicator has received
- * a message.
- *
- * @param ch connection to transport service
- * @param sender presumed sender of the message (details to be checked
- *        by higher layers)
- * @param msg the message
- * @param expected_addr_validity how long does the communicator believe it
- *        will continue to be able to receive messages from the same address
- *        on which it received this message?
- * @param cb function to call once handling the message is done, NULL if
- *         flow control is not supported by this communicator
- * @param cb_cls closure for @a cb
- * @return #GNUNET_OK if all is well, #GNUNET_NO if the message was
- *         immediately dropped due to memory limitations (communicator
- *         should try to apply back pressure),
- *         #GNUNET_SYSERR if the message could not be delivered because
- *         the transport service is not yet up
- */
 int
 GNUNET_TRANSPORT_communicator_receive (
   struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
@@ -970,25 +932,6 @@ GNUNET_TRANSPORT_communicator_receive (
 /* ************************* Discovery *************************** */
 
 
-/**
- * Notify transport service that an MQ became available due to an
- * "inbound" connection or because the communicator discovered the
- * presence of another peer.
- *
- * @param ch connection to transport service
- * @param peer peer with which we can now communicate
- * @param address address in human-readable format, 0-terminated, UTF-8
- * @param mtu maximum message size supported by queue, 0 if
- *            sending is not supported, SIZE_MAX for no MTU
- * @param q_len number of messages that can be send through this queue
- * @param priority queue priority. Queues with highest priority should be
- *                 used
- * @param nt which network type does the @a address belong to?
- * @param cc what characteristics does the communicator have?
- * @param cs what is the connection status of the queue?
- * @param mq message queue of the @a peer
- * @return API handle identifying the new MQ
- */
 struct GNUNET_TRANSPORT_QueueHandle *
 GNUNET_TRANSPORT_communicator_mq_add (
   struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
@@ -1023,15 +966,6 @@ GNUNET_TRANSPORT_communicator_mq_add (
 }
 
 
-/**
- * Notify transport service that an MQ was updated
- *
- * @param ch connection to transport service
- * @param qh the queue to update
- * @param q_len number of messages that can be send through this queue
- * @param priority queue priority. Queues with highest priority should be
- *                 used
- */
 void
 GNUNET_TRANSPORT_communicator_mq_update (
   struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
@@ -1149,20 +1083,6 @@ GNUNET_TRANSPORT_communicator_address_remove_all (
 /* ************************* Backchannel *************************** */
 
 
-/**
- * The communicator asks the transport service to route a message via
- * a different path to another communicator service at another peer.
- * This must only be done for special control traffic (as there is no
- * flow control for this API), such as acknowledgements, and generally
- * only be done if the communicator is uni-directional (i.e. cannot
- * send the message back itself).
- *
- * @param ch handle of this communicator
- * @param pid peer to send the message to
- * @param comm name of the communicator to send the message to
- * @param header header of the message to transmit and pass via the
- *        notify-API to @a pid's communicator @a comm
- */
 void
 GNUNET_TRANSPORT_communicator_notify (
   struct GNUNET_TRANSPORT_CommunicatorHandle *ch,
diff --git a/src/transport/transport_api_address_to_string.c b/src/transport/transport_api_address_to_string.c
index c7de39ea8..5b234f802 100644
--- a/src/transport/transport_api_address_to_string.c
+++ b/src/transport/transport_api_address_to_string.c
@@ -56,7 +56,7 @@ struct GNUNET_TRANSPORT_AddressToStringContext
  * Function called with responses from the service.
  *
  * @param cls our `struct GNUNET_TRANSPORT_AddressToStringContext *`
- * @param msg message with the human-readable address
+ * @param atsm message with the human-readable address
  * @return #GNUNET_OK if message is well-formed
  */
 static int
@@ -97,7 +97,7 @@ check_reply (void *cls,
  * Function called with responses from the service.
  *
  * @param cls our `struct GNUNET_TRANSPORT_AddressToStringContext *`
- * @param msg message with the human-readable address
+ * @param atsm message with the human-readable address
  */
 static void
 handle_reply (void *cls,
diff --git a/src/transport/transport_api_cmd_backchannel_check.c b/src/transport/transport_api_cmd_backchannel_check.c
index b285d7abf..1edd6cb7e 100644
--- a/src/transport/transport_api_cmd_backchannel_check.c
+++ b/src/transport/transport_api_cmd_backchannel_check.c
@@ -522,18 +522,6 @@ backchannel_check_cleanup (void *cls)
 }
 
 
-/**
- * Create command.
- *
- * @param label name for command.
- * @param start_peer_label Label of the cmd to start a peer.
- * @param create_label Label of the cmd to create the testing system.
- * @param num Number globally identifying the node.
- * @param node_n The number of the node in a network namespace.
- * @param namespace_n The number of the network namespace.
- * @param The topology for the test setup.
- * @return command.
- */
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_backchannel_check (const char *label,
                                         const char *start_peer_label,
diff --git a/src/transport/transport_api_cmd_connecting_peers.c b/src/transport/transport_api_cmd_connecting_peers.c
index 4d9e9c3ab..a6006f698 100644
--- a/src/transport/transport_api_cmd_connecting_peers.c
+++ b/src/transport/transport_api_cmd_connecting_peers.c
@@ -220,17 +220,6 @@ connect_peers_traits (void *cls,
 }
 
 
-/**
- * Create command
- *
- * @param label name for command
- * @param start_peer_label Label of the cmd to start a peer.
- * @param create_peer_label Label of the cmd which started the test system.
- * @param num Number globally identifying the node.
- * @param The topology for the test setup.
- * @param additional_connects Number of additional connects this cmd will wait for not triggered by this cmd.
- * @return command.
- */
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_connect_peers (const char *label,
                                     const char *start_peer_label,
diff --git a/src/transport/transport_api_cmd_send_simple.c b/src/transport/transport_api_cmd_send_simple.c
index a00e1b922..c71c952aa 100644
--- a/src/transport/transport_api_cmd_send_simple.c
+++ b/src/transport/transport_api_cmd_send_simple.c
@@ -137,16 +137,6 @@ send_simple_run (void *cls,
 }
 
 
-/**
- * Create command.
- *
- * @param label name for command.
- * @param start_peer_label Label of the cmd to start a peer.
- * @param start_peer_label Label of the cmd which started the test system.
- * @param num Number globally identifying the node.
- * @param The topology for the test setup.
- * @return command.
- */
 struct GNUNET_TESTING_Command
 GNUNET_TRANSPORT_cmd_send_simple (const char *label,
                                   const char *start_peer_label,
diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c
index 0ffaeb444..12612de09 100644
--- a/src/transport/transport_api_core.c
+++ b/src/transport/transport_api_core.c
@@ -713,7 +713,7 @@ handle_recv (void *cls, const struct InboundMessage *im)
  * Function we use for handling incoming set quota messages.
  *
  * @param cls closure, a `struct GNUNET_TRANSPORT_CoreHandle *`
- * @param msg message received
+ * @param qm message received
  */
 static void
 handle_set_quota (void *cls, const struct QuotaSetMessage *qm)
diff --git a/src/transport/transport_api_monitor_peers.c b/src/transport/transport_api_monitor_peers.c
index 2f0f07f23..ef1dc6087 100644
--- a/src/transport/transport_api_monitor_peers.c
+++ b/src/transport/transport_api_monitor_peers.c
@@ -389,32 +389,6 @@ do_peer_connect (void *cls)
 }
 
 
-/**
- * Return information about a specific peer or all peers currently known to
- * transport service once or in monitoring mode. To obtain information about
- * a specific peer, a peer identity can be passed. To obtain information about
- * all peers currently known to transport service, NULL can be passed as peer
- * identity.
- *
- * For each peer, the callback is called with information about the address used
- * to communicate with this peer, the state this peer is currently in and the
- * the current timeout for this state.
- *
- * Upon completion, the 'GNUNET_TRANSPORT_PeerIterateCallback' is called one
- * more time with 'NULL'. After this, the operation must no longer be
- * explicitly canceled.
- *
- * The #GNUNET_TRANSPORT_monitor_peers_cancel call MUST not be called in the
- * the peer_callback!
- *
- * @param cfg configuration to use
- * @param peer a specific peer identity to obtain information for,
- *      NULL for all peers
- * @param one_shot #GNUNET_YES to return the current state and then end (with NULL+NULL),
- *                 #GNUNET_NO to monitor peers continuously
- * @param peer_callback function to call with the results
- * @param peer_callback_cls closure for @a peer_address_callback
- */
 struct GNUNET_TRANSPORT_PeerMonitoringContext *
 GNUNET_TRANSPORT_monitor_peers (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                 const struct GNUNET_PeerIdentity *peer,
diff --git a/src/transport/transport_api_monitor_plugins.c b/src/transport/transport_api_monitor_plugins.c
index d8eddddaa..43a11442b 100644
--- a/src/transport/transport_api_monitor_plugins.c
+++ b/src/transport/transport_api_monitor_plugins.c
@@ -211,7 +211,7 @@ locate_by_id (void *cls,
  * Function called with responses from the service.
  *
  * @param cls our `struct GNUNET_TRANSPORT_PluginMonitor *`
- * @paramm tpmm message with event data
+ * @param tpmm message with event data
  * @return #GNUNET_Ok if message is well-formed
  */
 static int
@@ -243,7 +243,7 @@ check_event (void *cls,
  * Function called with responses from the service.
  *
  * @param cls our `struct GNUNET_TRANSPORT_PluginMonitor *`
- * @paramm tpmm message with event data
+ * @param tpmm message with event data
  */
 static void
 handle_event (void *cls,
diff --git a/src/transport/transport_api_offer_hello.c b/src/transport/transport_api_offer_hello.c
index eb342f57c..1b611aa6b 100644
--- a/src/transport/transport_api_offer_hello.c
+++ b/src/transport/transport_api_offer_hello.c
@@ -125,11 +125,6 @@ GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg,
 }
 
 
-/**
- * Cancel the request to transport to offer the HELLO message
- *
- * @param ohh the handle for the operation to cancel
- */
 void
 GNUNET_TRANSPORT_offer_hello_cancel (struct
                                      GNUNET_TRANSPORT_OfferHelloHandle *ohh)