[gnunet] 44/90: -DOC: Documentation cleanup pass through MESSENGER subsystem

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit dd797c2c6c01520fa73b1fd335ccd42df86b1b4d
Author: Willow Liquorice <willow@howhill.com>
AuthorDate: Wed Sep 7 20:44:52 2022 +0100

    -DOC: Documentation cleanup pass through MESSENGER subsystem
---
 src/include/gnunet_messenger_service.h             | 18 +++----
 src/messenger/gnunet-messenger.c                   | 14 +++---
 src/messenger/gnunet-service-messenger_ego_store.h | 22 ++++-----
 src/messenger/gnunet-service-messenger_handle.h    | 26 +++++-----
 .../gnunet-service-messenger_list_handles.h        | 10 ++--
 .../gnunet-service-messenger_list_messages.h       |  8 ++--
 src/messenger/gnunet-service-messenger_member.h    | 20 ++++----
 .../gnunet-service-messenger_member_session.h      | 16 +++----
 .../gnunet-service-messenger_member_store.h        | 12 ++---
 .../gnunet-service-messenger_message_handle.h      | 32 ++++++-------
 .../gnunet-service-messenger_message_recv.h        | 12 ++---
 .../gnunet-service-messenger_message_send.h        | 16 +++----
 .../gnunet-service-messenger_message_store.h       | 12 ++---
 src/messenger/gnunet-service-messenger_operation.h |  8 ++--
 .../gnunet-service-messenger_operation_store.h     |  8 ++--
 src/messenger/gnunet-service-messenger_room.h      | 56 +++++++++++-----------
 src/messenger/gnunet-service-messenger_service.h   | 32 ++++++-------
 src/messenger/gnunet-service-messenger_tunnel.h    | 26 +++++-----
 src/messenger/messenger_api_contact.h              | 10 ++--
 src/messenger/messenger_api_contact_store.h        | 14 +++---
 src/messenger/messenger_api_handle.h               | 18 +++----
 src/messenger/messenger_api_list_tunnels.h         | 16 +++----
 src/messenger/messenger_api_message.h              | 10 ++--
 src/messenger/messenger_api_room.h                 | 12 ++---
 src/messenger/messenger_api_util.h                 |  2 +-
 src/messenger/testing_messenger_barrier.h          |  4 +-
 26 files changed, 217 insertions(+), 217 deletions(-)

diff --git a/src/include/gnunet_messenger_service.h 
b/src/include/gnunet_messenger_service.h
index ff503de52..12f021d35 100644
--- a/src/include/gnunet_messenger_service.h
+++ b/src/include/gnunet_messenger_service.h
@@ -613,9 +613,9 @@ typedef int
  * @param[in] cfg Configuration to use
  * @param[in] name Name to look up an ego or NULL to stay anonymous
  * @param[in] identity_callback Function called when the EGO of the handle 
changes
- * @param[in/out] identity_cls Closure for the <i>identity_callback</i> handler
+ * @param[in,out] identity_cls Closure for the <i>identity_callback</i> handler
  * @param[in] msg_callback Function called when a new message is sent or 
received
- * @param[in/out] msg_cls Closure for the <i>msg_callback</i> handler
+ * @param[in,out] msg_cls Closure for the <i>msg_callback</i> handler
  * @return Messenger handle to use, NULL on error
  */
 struct GNUNET_MESSENGER_Handle*
@@ -634,7 +634,7 @@ GNUNET_MESSENGER_connect (const struct 
GNUNET_CONFIGURATION_Handle *cfg,
  * Keep in mind that this will fully delete the old ego key (if any is used) 
even if any other service wants to use it
  * as default.
  *
- * @param[in/out] handle Messenger handle to use
+ * @param[in,out] handle Messenger handle to use
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
 int
@@ -643,7 +643,7 @@ GNUNET_MESSENGER_update (struct GNUNET_MESSENGER_Handle 
*handle);
 /**
  * Disconnect all of the messengers used services and clears up its used 
memory.
  *
- * @param[in/out] handle Messenger handle to use
+ * @param[in,out] handle Messenger handle to use
  */
 void
 GNUNET_MESSENGER_disconnect (struct GNUNET_MESSENGER_Handle *handle);
@@ -662,7 +662,7 @@ GNUNET_MESSENGER_get_name (const struct 
GNUNET_MESSENGER_Handle *handle);
  * name to its new directory. If anything fails during this process the 
function returns #GNUNET_NO and the name for
  * the messenger won't change as specified.
  *
- * @param[in/out] handle Messenger handle to use
+ * @param[in,out] handle Messenger handle to use
  * @param[in] name Name for the messenger to change to
  * @return #GNUNET_YES on success, #GNUNET_NO on failure and #GNUNET_SYSERR if 
<i>handle</i> is NULL
  */
@@ -691,7 +691,7 @@ GNUNET_MESSENGER_get_key (const struct 
GNUNET_MESSENGER_Handle *handle);
  *
  * ( All <b>doors</b> form a ring structured network to shorten the latency 
sending and receiving messages. )
  *
- * @param[in/out] handle Messenger handle to use
+ * @param[in,out] handle Messenger handle to use
  * @param[in] key Hash identifying the port
  * @return Room handle, NULL on error
  */
@@ -712,7 +712,7 @@ GNUNET_MESSENGER_open_room (struct GNUNET_MESSENGER_Handle 
*handle,
  *
  * ( All <b>doors</b> form a ring structured network to shorten the latency 
sending and receiving messages. )
  *
- * @param[in/out] handle Messenger handle to use
+ * @param[in,out] handle Messenger handle to use
  * @param[in] door Peer identity of an open <b>door</b>
  * @param[in] key Hash identifying the port
  * @return Room handle, NULL on error
@@ -729,7 +729,7 @@ GNUNET_MESSENGER_enter_room (struct GNUNET_MESSENGER_Handle 
*handle,
  * ( After a member closes a <b>door</b>, all members entered through that 
specific <b>door</b> have to use another one
  * or open the room on their own. )
  *
- * @param[in/out] room Room handle
+ * @param[in,out] room Room handle
  */
 void
 GNUNET_MESSENGER_close_room (struct GNUNET_MESSENGER_Room *room);
@@ -805,7 +805,7 @@ GNUNET_MESSENGER_contact_get_key (const struct 
GNUNET_MESSENGER_Contact *contact
  *
  * Sending a message to all members in a given room can be done by providing 
NULL as contact.
  *
- * @param[in/out] room Room handle
+ * @param[in,out] room Room handle
  * @param[in] message New message to send
  * @param[in] contact Contact or NULL
  */
diff --git a/src/messenger/gnunet-messenger.c b/src/messenger/gnunet-messenger.c
index e2d106be8..11b0e091a 100644
--- a/src/messenger/gnunet-messenger.c
+++ b/src/messenger/gnunet-messenger.c
@@ -34,7 +34,7 @@ struct GNUNET_MESSENGER_Handle *messenger;
 /**
  * Function called whenever a message is received or sent.
  *
- * @param[in/out] cls Closure
+ * @param[in,out] cls Closure
  * @param[in] room Room
  * @param[in] sender Sender of message
  * @param[in] message Message
@@ -104,7 +104,7 @@ struct GNUNET_SCHEDULER_Task *read_task;
 /**
  * Task to shut down this application.
  *
- * @param[in/out] cls Closure
+ * @param[in,out] cls Closure
  */
 static void
 shutdown_hook (void *cls)
@@ -144,7 +144,7 @@ int private_mode;
 /**
  * Task run in stdio mode, after some data is available at stdin.
  *
- * @param[in/out] cls Closure
+ * @param[in,out] cls Closure
  */
 static void
 read_stdio (void *cls)
@@ -184,7 +184,7 @@ read_stdio (void *cls)
 /**
  * Wait for input on STDIO and send it out over the #ch.
  *
- * @param[in/out] cls Closure
+ * @param[in,out] cls Closure
  */
 static void
 listen_stdio (void *cls)
@@ -205,7 +205,7 @@ listen_stdio (void *cls)
 /**
  * Initial task to startup application.
  *
- * @param[in/out] cls Closure
+ * @param[in,out] cls Closure
  */
 static void
 idle (void *cls)
@@ -226,8 +226,8 @@ struct GNUNET_SCHEDULER_Task *shutdown_task;
 /**
  * Function called when an identity is retrieved.
  *
- * @param[in/out] cls Closure
- * @param[in/out] handle Handle of messenger service
+ * @param[in,out] cls Closure
+ * @param[in,out] handle Handle of messenger service
  */
 static void
 on_identity (void *cls,
diff --git a/src/messenger/gnunet-service-messenger_ego_store.h 
b/src/messenger/gnunet-service-messenger_ego_store.h
index a08310aa3..dbe6c05b9 100644
--- a/src/messenger/gnunet-service-messenger_ego_store.h
+++ b/src/messenger/gnunet-service-messenger_ego_store.h
@@ -96,7 +96,7 @@ init_ego_store (struct GNUNET_MESSENGER_EgoStore *store,
 /**
  * Clears an EGO-store, wipes its content and deallocates its memory.
  *
- * @param[in/out] store EGO-store
+ * @param[in,out] store EGO-store
  */
 void
 clear_ego_store (struct GNUNET_MESSENGER_EgoStore *store);
@@ -105,7 +105,7 @@ clear_ego_store (struct GNUNET_MESSENGER_EgoStore *store);
  * Creates a new EGO which will be registered to a <i>store</i> under
  * a specific <i>identifier</i>.
  *
- * @param[in/out] store EGO-store
+ * @param[in,out] store EGO-store
  * @param[in] identifier Identifier string
  */
 void
@@ -116,9 +116,9 @@ create_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
  * Binds an EGO which was registered to a <i>store</i> under
  * a specific <i>identifier</i> to a given <i>handle</i>
  *
- * @param[in/out] store EGO-store
+ * @param[in,out] store EGO-store
  * @param[in] identifier Identifier string
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  */
 void
 bind_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
@@ -129,9 +129,9 @@ bind_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
  * Binds an EGO which was registered to a <i>store</i> under
  * a specific <i>identifier</i> to a given <i>handle</i>
  *
- * @param[in/out] store EGO-store
+ * @param[in,out] store EGO-store
  * @param[in] identifier Identifier string
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  */
 void
 unbind_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
@@ -142,7 +142,7 @@ unbind_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
  * Lookups an EGO which was registered to a <i>store</i> under
  * a specific <i>identifier</i>.
  *
- * @param[in/out] store EGO-store
+ * @param[in,out] store EGO-store
  * @param[in] identifier Identifier string
  * @param[in] lookup Lookup callback (non-NULL)
  * @param[in] cls Closure
@@ -157,7 +157,7 @@ lookup_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
  * Updates the registration of an EGO to a <i>store</i> under
  * a specific <i>identifier</i> with a new <i>key</i>.
  *
- * @param[in/out] store EGO-store
+ * @param[in,out] store EGO-store
  * @param[in] identifier Identifier string
  * @param[in] key Private EGO key
  * @return Updated EGO
@@ -171,7 +171,7 @@ update_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
  * Deletes the registration of an EGO in a <i>store</i> under
  * a specific <i>identifier</i>.
  *
- * @param[in/out] store EGO-store
+ * @param[in,out] store EGO-store
  * @param[in] identifier Identifier string
  */
 void
@@ -183,7 +183,7 @@ delete_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
  * a different one under a specific <i>new_identifier</i> replacing
  * its old one.
  *
- * @param[in/out] store EGO-store
+ * @param[in,out] store EGO-store
  * @param[in] old_identifier Old identifier string
  * @param[in] new_identifier New identifier string
  */
@@ -196,7 +196,7 @@ rename_store_ego (struct GNUNET_MESSENGER_EgoStore *store,
  * Replaces the registered EGO in a <i>store</i> under a specific
  * <i>identifier</i> with a newly created one.
  *
- * @param[in/out] store EGO-store
+ * @param[in,out] store EGO-store
  * @param[in] identifier Identifier string
  */
 void
diff --git a/src/messenger/gnunet-service-messenger_handle.h 
b/src/messenger/gnunet-service-messenger_handle.h
index 8754716e9..c596f4d3b 100644
--- a/src/messenger/gnunet-service-messenger_handle.h
+++ b/src/messenger/gnunet-service-messenger_handle.h
@@ -55,8 +55,8 @@ struct GNUNET_MESSENGER_SrvHandle
 /**
  * Creates and allocates a new handle related to a <i>service</i> and using a 
given <i>mq</i> (message queue).
  *
- * @param[in/out] service MESSENGER Service
- * @param[in/out] mq Message queue
+ * @param[in,out] service MESSENGER Service
+ * @param[in,out] mq Message queue
  * @return New handle
  */
 struct GNUNET_MESSENGER_SrvHandle*
@@ -66,7 +66,7 @@ create_srv_handle (struct GNUNET_MESSENGER_Service *service,
 /**
  * Destroys a handle and frees its memory fully.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  */
 void
 destroy_srv_handle (struct GNUNET_MESSENGER_SrvHandle *handle);
@@ -103,7 +103,7 @@ get_srv_handle_member_id (const struct 
GNUNET_MESSENGER_SrvHandle *handle,
  *
  * The client connected to the <i>handle</i> will be informed afterwards 
automatically.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] key Key of a room
  * @param[in] unique_id Unique member id
  * @return GNUNET_OK on success, otherwise GNUNET_SYSERR
@@ -116,7 +116,7 @@ change_srv_handle_member_id (struct 
GNUNET_MESSENGER_SrvHandle *handle,
 /**
  * Sets the EGO used by a given <i>handle</i>.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] ego EGO key pair
  */
 void
@@ -135,7 +135,7 @@ get_srv_handle_ego (const struct GNUNET_MESSENGER_SrvHandle 
*handle);
 /**
  * Tries to set the name and EGO key of a <i>handle</i> initially by looking 
up a specific <i>name</i>.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] name Name (optionally: valid EGO name)
  */
 void
@@ -146,7 +146,7 @@ setup_srv_handle_name (struct GNUNET_MESSENGER_SrvHandle 
*handle,
  * Tries to change the key pair of an EGO of a <i>handle</i> under the same 
name and informs all rooms
  * about the change automatically.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  */
 void
 update_srv_handle (struct GNUNET_MESSENGER_SrvHandle *handle);
@@ -157,7 +157,7 @@ update_srv_handle (struct GNUNET_MESSENGER_SrvHandle 
*handle);
  *
  * The client connected to the <i>handle</i> will be informed afterwards 
automatically.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] name New name
  */
 void
@@ -168,7 +168,7 @@ set_srv_handle_name (struct GNUNET_MESSENGER_SrvHandle 
*handle,
  * Makes a given <i>handle</i> a member of the room using a specific 
<i>key</i> and opens the
  * room from the handles service.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] key Key of a room
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
@@ -180,7 +180,7 @@ open_srv_handle_room (struct GNUNET_MESSENGER_SrvHandle 
*handle,
  * Makes a given <i>handle</i> a member of the room using a specific 
<i>key</i> and enters the room
  * through a tunnel to a peer identified by a given <i>door</i> (peer 
identity).
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] door Peer identity
  * @param[in] key Key of a room
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
@@ -194,7 +194,7 @@ entry_srv_handle_room (struct GNUNET_MESSENGER_SrvHandle 
*handle,
  * Removes the membership of the room using a specific <i>key</i> and closes 
it if no other handle
  * from this service is still a member of it.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] key Key of a room
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
@@ -205,7 +205,7 @@ close_srv_handle_room (struct GNUNET_MESSENGER_SrvHandle 
*handle,
 /**
  * Sends a <i>message</i> from a given <i>handle</i> to the room using a 
specific <i>key</i>.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] key Key of a room
  * @param[in] message Message
  * @return #GNUNET_YES on success, #GNUNET_NO or #GNUNET_SYSERR otherwise.
@@ -218,7 +218,7 @@ send_srv_handle_message (struct GNUNET_MESSENGER_SrvHandle 
*handle,
 /**
  * Notifies the handle that a new message was received or sent.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] room Room of the message
  * @param[in] session Member session
  * @param[in] message Message
diff --git a/src/messenger/gnunet-service-messenger_list_handles.h 
b/src/messenger/gnunet-service-messenger_list_handles.h
index f4d7ca5c0..f41807d00 100644
--- a/src/messenger/gnunet-service-messenger_list_handles.h
+++ b/src/messenger/gnunet-service-messenger_list_handles.h
@@ -57,7 +57,7 @@ init_list_handles (struct GNUNET_MESSENGER_ListHandles 
*handles);
 /**
  * Destroys remaining <i>handles</i> and clears the list.
  *
- * @param[in/out] handles List of handles
+ * @param[in,out] handles List of handles
  */
 void
 clear_list_handles (struct GNUNET_MESSENGER_ListHandles *handles);
@@ -65,8 +65,8 @@ clear_list_handles (struct GNUNET_MESSENGER_ListHandles 
*handles);
 /**
  * Adds a specific <i>handle</i> to the end of the list.
  *
- * @param[in/out] handles List of handles
- * @param[in/out] handle Handle
+ * @param[in,out] handles List of handles
+ * @param[in,out] handle Handle
  */
 void
 add_list_handle (struct GNUNET_MESSENGER_ListHandles *handles,
@@ -76,8 +76,8 @@ add_list_handle (struct GNUNET_MESSENGER_ListHandles *handles,
  * Removes the first entry matching with a specific <i>handle</i> from the 
list of
  * <i>handles</i> and returns #GNUNET_YES on success or #GNUNET_NO on failure.
  *
- * @param[in/out] handles List of handles
- * @param[in/out] handle Handle
+ * @param[in,out] handles List of handles
+ * @param[in,out] handle Handle
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
 int
diff --git a/src/messenger/gnunet-service-messenger_list_messages.h 
b/src/messenger/gnunet-service-messenger_list_messages.h
index 7abc8c00f..e270209c8 100644
--- a/src/messenger/gnunet-service-messenger_list_messages.h
+++ b/src/messenger/gnunet-service-messenger_list_messages.h
@@ -56,7 +56,7 @@ init_list_messages (struct GNUNET_MESSENGER_ListMessages 
*messages);
 /**
  * Clears the list of message hashes.
  *
- * @param[in/out] messages List of hashes
+ * @param[in,out] messages List of hashes
  */
 void
 clear_list_messages (struct GNUNET_MESSENGER_ListMessages *messages);
@@ -64,7 +64,7 @@ clear_list_messages (struct GNUNET_MESSENGER_ListMessages 
*messages);
 /**
  * Adds a specific <i>hash</i> from a message to the end of the list.
  *
- * @param[in/out] messages List of hashes
+ * @param[in,out] messages List of hashes
  * @param[in] hash Hash of message
  */
 void
@@ -74,7 +74,7 @@ add_to_list_messages (struct GNUNET_MESSENGER_ListMessages 
*messages,
 /**
  * Copies all message hashes from an <i>origin</i> to another list.
  *
- * @param[in/out] messages Destination list of hashes
+ * @param[in,out] messages Destination list of hashes
  * @param[in] origin Source list of hashes
  */
 void
@@ -84,7 +84,7 @@ copy_list_messages (struct GNUNET_MESSENGER_ListMessages 
*messages,
 /**
  * Removes the first entry with a matching <i>hash</i> from the list.
  *
- * @param[in/out] messages List of hashes
+ * @param[in,out] messages List of hashes
  * @param[in] hash Hash of message
  */
 void
diff --git a/src/messenger/gnunet-service-messenger_member.h 
b/src/messenger/gnunet-service-messenger_member.h
index 46269315a..0c5870fd3 100644
--- a/src/messenger/gnunet-service-messenger_member.h
+++ b/src/messenger/gnunet-service-messenger_member.h
@@ -47,7 +47,7 @@ struct GNUNET_MESSENGER_Member
  *
  * If the creation fails, NULL gets returned.
  *
- * @param[in/out] store Member store
+ * @param[in,out] store Member store
  * @param[in] id Member id or NULL
  * @return New member or NULL
  */
@@ -58,7 +58,7 @@ create_member (struct GNUNET_MESSENGER_MemberStore *store,
 /**
  * Destroys a member and frees its memory fully.
  *
- * @param[in/out] member Member
+ * @param[in,out] member Member
  */
 void
 destroy_member (struct GNUNET_MESSENGER_Member *member);
@@ -88,7 +88,7 @@ load_member (struct GNUNET_MESSENGER_MemberStore *store,
  * Loads data about next sessions from a <i>directory</i> into an empty loaded
  * <i>member</i> which does not contain a fully built session graph yet.
  *
- * @param[in/out] member Member
+ * @param[in,out] member Member
  * @param[in] directory Path to a directory
  */
 void
@@ -110,7 +110,7 @@ save_member (struct GNUNET_MESSENGER_Member *member,
  * Synchronizes contacts between all sessions from a given <i>member</i>
  * and other sessions which are linked to them.
  *
- * @param[in/out] member Member
+ * @param[in,out] member Member
  */
 void
 sync_member_contacts (struct GNUNET_MESSENGER_Member *member);
@@ -145,8 +145,8 @@ get_member_session_of (struct GNUNET_MESSENGER_Member 
*member,
 /**
  * Adds a given member <i>session</i> to its <i>member</i>.
  *
- * @param[in/out] member Member
- * @param[in/out] session Member session
+ * @param[in,out] member Member
+ * @param[in,out] session Member session
  */
 void
 add_member_session (struct GNUNET_MESSENGER_Member *member,
@@ -155,8 +155,8 @@ add_member_session (struct GNUNET_MESSENGER_Member *member,
 /**
  * Removes a given member <i>session</i> from its <i>member</i>.
  *
- * @param[in/out] member Member
- * @param[in/out] session Member session
+ * @param[in,out] member Member
+ * @param[in,out] session Member session
  */
 void
 remove_member_session (struct GNUNET_MESSENGER_Member *member,
@@ -167,9 +167,9 @@ remove_member_session (struct GNUNET_MESSENGER_Member 
*member,
  * and call the provided iterator callback with a selected closure. The 
function
  * will return the amount of member sessions it iterated through.
  *
- * @param[in/out] member Member
+ * @param[in,out] member Member
  * @param[in] it Iterator callback
- * @param[in/out] cls Closure
+ * @param[in,out] cls Closure
  * @return Amount of sessions iterated through
  */
 int
diff --git a/src/messenger/gnunet-service-messenger_member_session.h 
b/src/messenger/gnunet-service-messenger_member_session.h
index 9ba801776..fcde2c3de 100644
--- a/src/messenger/gnunet-service-messenger_member_session.h
+++ b/src/messenger/gnunet-service-messenger_member_session.h
@@ -62,7 +62,7 @@ struct GNUNET_MESSENGER_MemberSession {
  *
  * If the creation fails, NULL gets returned.
  *
- * @param[in/out] member Member
+ * @param[in,out] member Member
  * @param[in] pubkey Public key of EGO
  * @return New member session
  */
@@ -77,7 +77,7 @@ create_member_session (struct GNUNET_MESSENGER_Member *member,
  * <i>message</i> to switch session. The new session will be linked to the old
  * one.
  *
- * @param[in/out] session Old member session
+ * @param[in,out] session Old member session
  * @param[in] message Message
  * @param[in] hash Hash of message
  * @return New member session
@@ -90,7 +90,7 @@ switch_member_session (struct GNUNET_MESSENGER_MemberSession 
*session,
 /**
  * Destroys a member session and frees its memory fully.
  *
- * @param[in/out] session Member session
+ * @param[in,out] session Member session
  */
 void
 destroy_member_session(struct GNUNET_MESSENGER_MemberSession* session);
@@ -101,7 +101,7 @@ destroy_member_session(struct 
GNUNET_MESSENGER_MemberSession* session);
  * be dropped. The member sessions messages will be cleared but old
  * history from uncompleted sessions however can be reused!
  *
- * @param[in/out] session Member session
+ * @param[in,out] session Member session
  * @param[in] hash Hash of initial message (JOIN message!)
  * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
@@ -116,7 +116,7 @@ reset_member_session (struct 
GNUNET_MESSENGER_MemberSession* session,
  * Closing a session may complete a session and can't be used without
  * a reset! ( @see #reset_member_session() )
  *
- * @param[in/out] session Member session
+ * @param[in,out] session Member session
  */
 void
 close_member_session (struct GNUNET_MESSENGER_MemberSession* session);
@@ -234,7 +234,7 @@ check_member_session_history (const struct 
GNUNET_MESSENGER_MemberSession *sessi
  *
  * @see #is_member_session_completed() for updating a history.
  *
- * @param[in/out] session Member session
+ * @param[in,out] session Member session
  * @param[in] message Message
  * @param[in] hash Hash of message
  */
@@ -247,7 +247,7 @@ update_member_session_history (struct 
GNUNET_MESSENGER_MemberSession *session,
  * Removes a message from the history of a <i>session</i> using the messages
  * <i>hash</i>.
  *
- * @param[in/out] session Member session
+ * @param[in,out] session Member session
  * @param[in] hash Hash of message
  */
 void
@@ -271,7 +271,7 @@ load_member_session (struct GNUNET_MESSENGER_Member *member,
  * next attribute. Necessary information will be loaded from a configuration
  * file inside of a given <i>directory</i>.
  *
- * @param[in/out] session Member session
+ * @param[in,out] session Member session
  * @param[in] directory Path to a directory
  */
 void
diff --git a/src/messenger/gnunet-service-messenger_member_store.h 
b/src/messenger/gnunet-service-messenger_member_store.h
index af50f0d36..c3f6d478a 100644
--- a/src/messenger/gnunet-service-messenger_member_store.h
+++ b/src/messenger/gnunet-service-messenger_member_store.h
@@ -62,7 +62,7 @@ init_member_store (struct GNUNET_MESSENGER_MemberStore *store,
 /**
  * Clears a member <i>store</i>, wipes its content and deallocates its memory.
  *
- * @param[in/out] store Member store
+ * @param[in,out] store Member store
  */
 void
 clear_member_store (struct GNUNET_MESSENGER_MemberStore *store);
@@ -70,7 +70,7 @@ clear_member_store (struct GNUNET_MESSENGER_MemberStore 
*store);
 /**
  * Returns the used contact store of a given member <i>store</i>.
  *
- * @param[in/out] store Member store
+ * @param[in,out] store Member store
  * @return Contact store
  */
 struct GNUNET_MESSENGER_ContactStore*
@@ -121,7 +121,7 @@ get_store_member (const struct GNUNET_MESSENGER_MemberStore 
*store,
  * Returns the member of a <i>store</i> using a sender id of a given 
<i>message</i>.
  * If the member does not provide a matching session, NULL gets returned.
  *
- * @param[in/out] store Member store
+ * @param[in,out] store Member store
  * @param[in] message Message
  * @return Member or NULL
  */
@@ -132,7 +132,7 @@ get_store_member_of (struct GNUNET_MESSENGER_MemberStore 
*store,
 /**
  * Adds a member to a <i>store</i> under a specific <i>id</i> and returns it 
on success.
  *
- * @param[in/out] store Member store
+ * @param[in,out] store Member store
  * @param[in] id Member id
  * @return Member or NULL
  */
@@ -145,9 +145,9 @@ add_store_member (struct GNUNET_MESSENGER_MemberStore 
*store,
  * member <i>store</i> and call the provided iterator callback with a selected 
closure.
  * The function will return the amount of members it iterated through.
  *
- * @param[in/out] store Member store
+ * @param[in,out] store Member store
  * @param[in] it Iterator callback
- * @param[in/out] cls Closure
+ * @param[in,out] cls Closure
  * @return Amount of members iterated through
  */
 int
diff --git a/src/messenger/gnunet-service-messenger_message_handle.h 
b/src/messenger/gnunet-service-messenger_message_handle.h
index 0e5be3408..62940e6b6 100644
--- a/src/messenger/gnunet-service-messenger_message_handle.h
+++ b/src/messenger/gnunet-service-messenger_message_handle.h
@@ -39,8 +39,8 @@
  * Handles a received or sent join message to make changes of current member 
information.
  * (add matching member and clear member info)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
+ * @param[in,out] room Room of the message
+ * @param[in,out] session Member session
  * @param[in] message JOIN-Message
  * @param[in] hash Hash of the message
  */
@@ -54,8 +54,8 @@ handle_message_join (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a received or sent leave message to make changes of current member 
information.
  * (remove matching member and clear member info)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
+ * @param[in,out] room Room of the message
+ * @param[in,out] session Member session
  * @param[in] message LEAVE-Message
  * @param[in] hash Hash of the message
  */
@@ -69,8 +69,8 @@ handle_message_leave (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a received or sent name message to rename a current member.
  * (change name of matching member)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
+ * @param[in,out] room Room of the message
+ * @param[in,out] session Member session
  * @param[in] message NAME-Message
  * @param[in] hash Hash of the message
  */
@@ -84,8 +84,8 @@ handle_message_name (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a received or sent key message to change the key of a member and 
rearrange the contacts accordingly.
  * (move the member in the contacts and change its key)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
+ * @param[in,out] room Room of the message
+ * @param[in,out] session Member session
  * @param[in] message KEY-Message
  * @param[in] hash Hash of the message
  */
@@ -99,8 +99,8 @@ handle_message_key (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a received or sent peer message to make changes of the basement in 
the room.
  * (add a new peer to the basement and restructure connections based on 
updated list of peers)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
+ * @param[in,out] room Room of the message
+ * @param[in,out] session Member session
  * @param[in] message PEER-Message
  * @param[in] hash Hash of the message
  */
@@ -114,8 +114,8 @@ handle_message_peer (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a received or sent id message to change a members id.
  * (change id of matching member)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
+ * @param[in,out] room Room of the message
+ * @param[in,out] session Member session
  * @param[in] message ID-Message
  * @param[in] hash Hash of the message
  */
@@ -129,8 +129,8 @@ handle_message_id (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a received or sent miss message to drop a peer from the basement in 
the room.
  * (remove a peer from the basement and restructure connections based on 
updated list of peers)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
+ * @param[in,out] room Room of the message
+ * @param[in,out] session Member session
  * @param[in] message MISS-Message
  * @param[in] hash Hash of the message
  */
@@ -144,8 +144,8 @@ handle_message_miss (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a received or sent delete message to delete a specific message from 
the store.
  * (remove a message from the store of a room under a given delay)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] session Member session
+ * @param[in,out] room Room of the message
+ * @param[in,out] session Member session
  * @param[in] message DELETE-Message
  * @param[in] hash Hash of the message
  */
diff --git a/src/messenger/gnunet-service-messenger_message_recv.h 
b/src/messenger/gnunet-service-messenger_message_recv.h
index 400c10245..b4304762b 100644
--- a/src/messenger/gnunet-service-messenger_message_recv.h
+++ b/src/messenger/gnunet-service-messenger_message_recv.h
@@ -39,8 +39,8 @@
  * Handles a received info message to change the current member id to the one 
generated by
  * the host connected to. (all current tunnels will be informed about the id 
change)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] tunnel Receiving connection
+ * @param[in,out] room Room of the message
+ * @param[in,out] tunnel Receiving connection
  * @param[in] message INFO-Message
  * @param[in] hash Hash of the message
  * @return #GNUNET_NO to not forward the message
@@ -55,8 +55,8 @@ recv_message_info (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a received peer message to link it to its origin tunnel if the peer 
identity matches.
  * (the peer message and the member id can potentially be linked to the tunnel)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] tunnel Receiving connection
+ * @param[in,out] room Room of the message
+ * @param[in,out] tunnel Receiving connection
  * @param[in] message PEER-Message
  * @param[in] hash Hash of the message
  * @return #GNUNET_YES to forward the message
@@ -72,8 +72,8 @@ recv_message_peer (struct GNUNET_MESSENGER_SrvRoom *room,
  * if the message was found.
  * (this can also cause this peer to send a new request instead of only 
forwarding the received one)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] tunnel Receiving connection
+ * @param[in,out] room Room of the message
+ * @param[in,out] tunnel Receiving connection
  * @param[in] message REQUEST-Message
  * @param[in] hash Hash of the message
  * @return #GNUNET_YES or #GNUNET_NO depending on required forwarding
diff --git a/src/messenger/gnunet-service-messenger_message_send.h 
b/src/messenger/gnunet-service-messenger_message_send.h
index 232355c41..8d782c5a6 100644
--- a/src/messenger/gnunet-service-messenger_message_send.h
+++ b/src/messenger/gnunet-service-messenger_message_send.h
@@ -38,8 +38,8 @@
  * Handles a sent join message to ensure growth of the decentralized room 
structure.
  * (if the service provides a peer message for this room currently, it will be 
forwarded)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] handle Sending handle
+ * @param[in,out] room Room of the message
+ * @param[in,out] handle Sending handle
  * @param[in] message JOIN-Message
  * @param[in] hash Hash of the message
  */
@@ -53,8 +53,8 @@ send_message_join (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a sent peer message to update the rooms peer message of this 
service.
  * (a set peer message indicates this service being a part of the 
decentralized room structure)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] handle Sending handle
+ * @param[in,out] room Room of the message
+ * @param[in,out] handle Sending handle
  * @param[in] message PEER-Message
  * @param[in] hash Hash of the message
  */
@@ -68,8 +68,8 @@ send_message_peer (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a sent id message to update the handles member id in the room.
  * (changing member id is useful to prevent collisions)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] handle Sending handle
+ * @param[in,out] room Room of the message
+ * @param[in,out] handle Sending handle
  * @param[in] message ID-Message
  * @param[in] hash Hash of the message
  */
@@ -83,8 +83,8 @@ send_message_id (struct GNUNET_MESSENGER_SrvRoom *room,
  * Handles a sent request message to trigger the request operation for this 
service.
  * (the request operation will deactivate the possibility of spamming requests)
  *
- * @param[in/out] room Room of the message
- * @param[in/out] handle Sending handle
+ * @param[in,out] room Room of the message
+ * @param[in,out] handle Sending handle
  * @param[in] message PEER-Message
  * @param[in] hash Hash of the message
  */
diff --git a/src/messenger/gnunet-service-messenger_message_store.h 
b/src/messenger/gnunet-service-messenger_message_store.h
index 476d98dd5..60efb1380 100644
--- a/src/messenger/gnunet-service-messenger_message_store.h
+++ b/src/messenger/gnunet-service-messenger_message_store.h
@@ -69,7 +69,7 @@ init_message_store (struct GNUNET_MESSENGER_MessageStore 
*store);
 /**
  * Clears a message <i>store</i>, wipes its content and deallocates its memory.
  *
- * @param[in/out] store Message store
+ * @param[in,out] store Message store
  */
 void
 clear_message_store (struct GNUNET_MESSENGER_MessageStore *store);
@@ -115,7 +115,7 @@ contains_store_message (const struct 
GNUNET_MESSENGER_MessageStore *store,
  * This function requires the message to be loaded into memory!
  * @see contains_store_message()
  *
- * @param[in/out] store Message store
+ * @param[in,out] store Message store
  * @param[in] hash Hash of message
  * @return Message or NULL
  */
@@ -131,7 +131,7 @@ get_store_message (struct GNUNET_MESSENGER_MessageStore 
*store,
  * hash. The link which will be returned copies link information from the 
message for
  * temporary usage.
  *
- * @param[in/out] store Message store
+ * @param[in,out] store Message store
  * @param[in] hash Hash of message
  * @param[in] deleted_only Flag
  * @return Message link or NULL
@@ -144,9 +144,9 @@ get_store_message_link (struct 
GNUNET_MESSENGER_MessageStore *store,
 /**
  * Stores a message into the message store. The result indicates if the 
operation was successful.
  *
- * @param[in/out] store Message store
+ * @param[in,out] store Message store
  * @param[in] hash Hash of message
- * @param[in/out] message Message
+ * @param[in,out] message Message
  * @return #GNUNET_OK on success, otherwise #GNUNET_NO
  */
 int
@@ -158,7 +158,7 @@ put_store_message (struct GNUNET_MESSENGER_MessageStore 
*store,
  * Deletes a message in the message store. It will be removed from disk space 
and memory. The result
  * indicates if the operation was successful.
  *
- * @param[in/out] store Message store
+ * @param[in,out] store Message store
  * @param[in] hash Hash of message
  * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure
  */
diff --git a/src/messenger/gnunet-service-messenger_operation.h 
b/src/messenger/gnunet-service-messenger_operation.h
index 485668548..8d09ed1b7 100644
--- a/src/messenger/gnunet-service-messenger_operation.h
+++ b/src/messenger/gnunet-service-messenger_operation.h
@@ -66,7 +66,7 @@ create_operation (const struct GNUNET_HashCode *hash);
 /**
  * Destroys an operation and frees its memory fully.
  *
- * @param[in/out] op Operation
+ * @param[in,out] op Operation
  */
 void
 destroy_operation (struct GNUNET_MESSENGER_Operation *op);
@@ -82,7 +82,7 @@ destroy_operation (struct GNUNET_MESSENGER_Operation *op);
  * If the method fails to restore any valid operation from the file,
  * NULL gets returned instead.
  *
- * @param[in/out] store Operation store
+ * @param[in,out] store Operation store
  * @param[in] path Path of a configuration file
  */
 struct GNUNET_MESSENGER_Operation*
@@ -107,9 +107,9 @@ save_operation (const struct GNUNET_MESSENGER_Operation *op,
  * operations type to process it correctly. An operation can't be
  * started twice, it has to be stopped or fully processed first.
  *
- * @param[in/out] op Operation
+ * @param[in,out] op Operation
  * @param[in] type Type of operation
- * @param[in/out] store Operation store
+ * @param[in,out] store Operation store
  * @param[in] delay Delay
  * @return #GNUNET_OK on success, otherwise #GNUNET_SYSERR
  */
diff --git a/src/messenger/gnunet-service-messenger_operation_store.h 
b/src/messenger/gnunet-service-messenger_operation_store.h
index 18eb7f8a1..db315f251 100644
--- a/src/messenger/gnunet-service-messenger_operation_store.h
+++ b/src/messenger/gnunet-service-messenger_operation_store.h
@@ -45,7 +45,7 @@ struct GNUNET_MESSENGER_OperationStore
  * Initializes an operation <i>store</i> as fully empty with a given 
<i>room</i>.
  *
  * @param[out] store Operation store
- * @param[in/out] room Room
+ * @param[in,out] room Room
  */
 void
 init_operation_store (struct GNUNET_MESSENGER_OperationStore *store,
@@ -54,7 +54,7 @@ init_operation_store (struct GNUNET_MESSENGER_OperationStore 
*store,
 /**
  * Clears an operation <i>store</i>, stops all operations and deallocates its 
memory.
  *
- * @param[in/out] store Operation store
+ * @param[in,out] store Operation store
  */
 void
 clear_operation_store (struct GNUNET_MESSENGER_OperationStore *store);
@@ -103,7 +103,7 @@ get_store_operation_type (const struct 
GNUNET_MESSENGER_OperationStore *store,
  * If the new operation could be started successfully the method returns
  * #GNUNET_OK, otherwise #GNUNET_SYSERR.
  *
- * @param[in/out] store Operation store
+ * @param[in,out] store Operation store
  * @param[in] hash Hash of message
  * @param[in] type Operation type
  * @param[in] delay Delay
@@ -122,7 +122,7 @@ use_store_operation (struct GNUNET_MESSENGER_OperationStore 
*store,
  * Beware that calling this method will also implicitly free the memory
  * of any active operation under the given hash!
  *
- * @param[in/out] store Operation store
+ * @param[in,out] store Operation store
  * @param[in] hash Hash of message
  */
 void
diff --git a/src/messenger/gnunet-service-messenger_room.h 
b/src/messenger/gnunet-service-messenger_room.h
index a6ae45275..6767d96cb 100644
--- a/src/messenger/gnunet-service-messenger_room.h
+++ b/src/messenger/gnunet-service-messenger_room.h
@@ -84,7 +84,7 @@ struct GNUNET_MESSENGER_SrvRoom
 /**
  * Creates and allocates a new room for a <i>handle</i> with a given 
<i>key</i>.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] key Key of room
  * @return New room
  */
@@ -98,7 +98,7 @@ create_srv_room (struct GNUNET_MESSENGER_SrvHandle *handle,
  * The <i>deletion</i> flag should only be set to #GNUNET_YES if the
  * room gets dropped by the service, otherwise #GNUNET_NO.
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  * @param[in] deletion Flag to indicate context of destruction
  */
 void
@@ -108,7 +108,7 @@ destroy_srv_room (struct GNUNET_MESSENGER_SrvRoom *room,
 /**
  * Returns the used member store of a given <i>room</i>.
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  * @return Member store
  */
 struct GNUNET_MESSENGER_MemberStore*
@@ -117,7 +117,7 @@ get_srv_room_member_store (struct GNUNET_MESSENGER_SrvRoom 
*room);
 /**
  * Returns the used message store of a given <i>room</i>.
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  * @return Message store
  */
 struct GNUNET_MESSENGER_MessageStore*
@@ -126,7 +126,7 @@ get_srv_room_message_store (struct GNUNET_MESSENGER_SrvRoom 
*room);
 /**
  * Returns the used operation store of a given <i>room</i>.
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  * @return Operation store
  */
 struct GNUNET_MESSENGER_OperationStore*
@@ -140,8 +140,8 @@ get_srv_room_operation_store (struct 
GNUNET_MESSENGER_SrvRoom *room);
  *
  * If the function returns #GNUNET_YES the port for this room is guaranteed to 
be open for incoming connections.
  *
- * @param[in/out] room Room
- * @param[in/out] handle Handle
+ * @param[in,out] room Room
+ * @param[in,out] handle Handle
  * @return #GNUNET_YES on success, #GNUNET_NO on failure.
  */
 int
@@ -153,8 +153,8 @@ open_srv_room (struct GNUNET_MESSENGER_SrvRoom *room,
  * a peer identity of a hosting peer. During the connection the handle will 
join the room as a member, waiting for
  * an info message from the selected host.
  *
- * @param[in/out] room Room
- * @param[in/out] handle Handle
+ * @param[in,out] room Room
+ * @param[in,out] handle Handle
  * @param[in] door Peer identity
  * @return #GNUNET_YES on success, #GNUNET_NO on failure.
  */
@@ -175,7 +175,7 @@ enter_srv_room_at (struct GNUNET_MESSENGER_SrvRoom *room,
  *
  * @param[in] room Room
  * @param[in] handle Handle
- * @param[in/out] message Message
+ * @param[in,out] message Message
  * @param[out] hash Hash of message
  * @param[in] mode Packing mode
  * @return New envelope or NULL
@@ -197,9 +197,9 @@ pack_srv_room_message (const struct 
GNUNET_MESSENGER_SrvRoom *room,
  * The function returns #GNUNET_YES on success, #GNUNET_NO if message is null 
and
  * #GNUNET_SYSERR if the message was known already.
  *
- * @param[in/out] room Room
- * @param[in/out] handle Handle
- * @param[in/out] message Message
+ * @param[in,out] room Room
+ * @param[in,out] handle Handle
+ * @param[in,out] message Message
  * @return #GNUNET_YES on success, #GNUNET_NO or #GNUNET_SYSERR otherwise.
  */
 int
@@ -210,9 +210,9 @@ send_srv_room_message (struct GNUNET_MESSENGER_SrvRoom 
*room,
 /**
  * Forwards a <i>message</i> with a given <i>hash</i> to a specific 
<i>tunnel</i> inside of a <i>room</i>.
  *
- * @param[in/out] room Room
- * @param[in/out] tunnel Tunnel
- * @param[in/out] message Message
+ * @param[in,out] room Room
+ * @param[in,out] tunnel Tunnel
+ * @param[in,out] message Message
  * @param[in] hash Hash of message
  */
 void
@@ -226,8 +226,8 @@ forward_srv_room_message (struct GNUNET_MESSENGER_SrvRoom 
*room,
  * if necessary to a selected <i>tunnel</i> or to all connected tunnels if 
necessary or if the
  * selected tunnel is NULL.
  *
- * @param[in/out] room Room
- * @param[in/out] tunnel Tunnel
+ * @param[in,out] room Room
+ * @param[in,out] tunnel Tunnel
  */
 void
 check_srv_room_peer_status (struct GNUNET_MESSENGER_SrvRoom *room,
@@ -237,8 +237,8 @@ check_srv_room_peer_status (struct GNUNET_MESSENGER_SrvRoom 
*room,
  * Reduces all current forks inside of the message history of a <i>room</i> to 
one remaining last message
  * by merging them down. All merge messages will be sent from a given 
<i>handle</i>.
  *
- * @param[in/out] room Room
- * @param[in/out] handle Handle
+ * @param[in,out] room Room
+ * @param[in,out] handle Handle
  */
 void
 merge_srv_room_last_messages (struct GNUNET_MESSENGER_SrvRoom *room,
@@ -248,8 +248,8 @@ merge_srv_room_last_messages (struct 
GNUNET_MESSENGER_SrvRoom *room,
  * Deletes a message from the <i>room</i> with a given <i>hash</i> in a 
specific <i>delay</i> if
  * the provided member by its session is permitted to do so.
  *
- * @param[in/out] room Room
- * @param[in/out] session Member session
+ * @param[in,out] room Room
+ * @param[in,out] session Member session
  * @param[in] hash Hash of message
  * @param[in] delay Delay of deletion
  * @return #GNUNET_YES on success, #GNUNET_NO if permission gets denied, 
#GNUNET_SYSERR on operation failure
@@ -263,7 +263,7 @@ delete_srv_room_message (struct GNUNET_MESSENGER_SrvRoom 
*room,
 /**
  * Returns the CADET handle from a rooms service.
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  * @return CADET handle
  */
 struct GNUNET_CADET_Handle*
@@ -293,8 +293,8 @@ get_srv_room_tunnel (const struct GNUNET_MESSENGER_SrvRoom 
*room,
 /**
  * Method called whenever a <i>message</i> is found during a request in a 
<i>room</i>.
  *
- * @param[in/out] cls Closure from #request_room_message
- * @param[in/out] room Room
+ * @param[in,out] cls Closure from #request_room_message
+ * @param[in,out] room Room
  * @param[in] message Message or NULL
  * @param[in] hash Hash of message
  */
@@ -314,7 +314,7 @@ typedef void (GNUNET_MESSENGER_MessageRequestCallback) (
  * It is also possible that the given callback will not be called if the 
requesting session is not
  * permitted!
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  * @param[in] hash Hash of message
  * @param[in] callback Callback to process result
  * @param[in] cls Closure for the <i>callback</i>
@@ -331,7 +331,7 @@ request_srv_room_message (struct GNUNET_MESSENGER_SrvRoom 
*room,
  * Checks for potential collisions with member ids and solves them changing 
active handles ids if they
  * use an already used member id (comparing public key and timestamp).
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  * @param[in] public_key Public key of EGO
  * @param[in] member_id Member ID
  * @param[in] timestamp Timestamp
@@ -346,7 +346,7 @@ solve_srv_room_member_collisions (struct 
GNUNET_MESSENGER_SrvRoom *room,
  * Rebuilds the decentralized structure for a <i>room</i> by ensuring all 
required connections are made
  * depending on the amount of peers and this peers index in the list of them.
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  */
 void
 rebuild_srv_room_basement_structure (struct GNUNET_MESSENGER_SrvRoom *room);
diff --git a/src/messenger/gnunet-service-messenger_service.h 
b/src/messenger/gnunet-service-messenger_service.h
index d364a93c0..55e8b6c50 100644
--- a/src/messenger/gnunet-service-messenger_service.h
+++ b/src/messenger/gnunet-service-messenger_service.h
@@ -64,7 +64,7 @@ struct GNUNET_MESSENGER_Service
  * Creates and allocates a new service using a given <i>config</i> and a 
GNUnet service handle.
  *
  * @param[in] config Configuration
- * @param[in/out] service_handle GNUnet service handle
+ * @param[in,out] service_handle GNUnet service handle
  * @return New service
  */
 struct GNUNET_MESSENGER_Service*
@@ -74,7 +74,7 @@ create_service (const struct GNUNET_CONFIGURATION_Handle 
*config,
 /**
  * Destroys a <i>service</i> and frees its memory fully.
  *
- * @param[in/out] service Service
+ * @param[in,out] service Service
  */
 void
 destroy_service (struct GNUNET_MESSENGER_Service *service);
@@ -82,7 +82,7 @@ destroy_service (struct GNUNET_MESSENGER_Service *service);
 /**
  * Returns the used EGO-store of a given <i>service</i>.
  *
- * @param[in/out] service Service
+ * @param[in,out] service Service
  * @return EGO-store
  */
 struct GNUNET_MESSENGER_EgoStore*
@@ -91,7 +91,7 @@ get_service_ego_store (struct GNUNET_MESSENGER_Service 
*service);
 /**
  * Returns the used contact store of a given <i>service</i>.
  *
- * @param[in/out] service Service
+ * @param[in,out] service Service
  * @return Contact store
  */
 struct GNUNET_MESSENGER_ContactStore*
@@ -100,8 +100,8 @@ get_service_contact_store (struct GNUNET_MESSENGER_Service 
*service);
 /**
  * Creates and adds a new handle to a <i>service</i> using a given message 
queue.
  *
- * @param[in/out] service Service
- * @param[in/out] mq Message queue
+ * @param[in,out] service Service
+ * @param[in,out] mq Message queue
  * @return New handle
  */
 struct GNUNET_MESSENGER_SrvHandle*
@@ -111,8 +111,8 @@ add_service_handle (struct GNUNET_MESSENGER_Service 
*service,
 /**
  * Removes a <i>handle</i> from a <i>service</i> and destroys it.
  *
- * @param[in/out] service Service
- * @param[in/out] handle Handle
+ * @param[in,out] service Service
+ * @param[in,out] handle Handle
  */
 void
 remove_service_handle (struct GNUNET_MESSENGER_Service *service,
@@ -146,8 +146,8 @@ get_service_room (const struct GNUNET_MESSENGER_Service 
*service,
  * Tries to open a room using a given <i>key</i> for a <i>service</i> by a 
specific <i>handle</i>. The room will be
  * created if necessary. If the function is successful, it returns 
#GNUNET_YES, otherwise #GNUNET_NO.
  *
- * @param[in/out] service Service
- * @param[in/out] handle Handle
+ * @param[in,out] service Service
+ * @param[in,out] handle Handle
  * @param[in] key Key of room
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
@@ -163,8 +163,8 @@ open_service_room (struct GNUNET_MESSENGER_Service *service,
  * The room will be entered through the peer identitied by the peer identity 
provided as <i>door</i> parameter and
  * a new connection will be made.
  *
- * @param[in/out] service Service
- * @param[in/out] handle Handle
+ * @param[in,out] service Service
+ * @param[in,out] handle Handle
  * @param[in] door Peer identity
  * @param[in] key Key of room
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
@@ -182,8 +182,8 @@ entry_service_room (struct GNUNET_MESSENGER_Service 
*service,
  * If the specific handle is currently the host of the room for this service, 
a new handle which is a member will
  * take its place. Otherwise the room will be destroyed for this service.
  *
- * @param[in/out] service Service
- * @param[in/out] handle Handle
+ * @param[in,out] service Service
+ * @param[in,out] handle Handle
  * @param[in] key Key of room
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
@@ -196,8 +196,8 @@ close_service_room (struct GNUNET_MESSENGER_Service 
*service,
  * Sends a received or sent <i>message</i> with a given <i>hash</i> to each 
handle of a <i>service</i> which
  * is currently member of a specific <i>room</i> for handling it in the client 
API.
  *
- * @param[in/out] service Service
- * @param[in/out] room Room
+ * @param[in,out] service Service
+ * @param[in,out] room Room
  * @param[in] session Member session
  * @param[in] message Message
  * @param[in] hash Hash of message
diff --git a/src/messenger/gnunet-service-messenger_tunnel.h 
b/src/messenger/gnunet-service-messenger_tunnel.h
index 7bd749281..13cf924f9 100644
--- a/src/messenger/gnunet-service-messenger_tunnel.h
+++ b/src/messenger/gnunet-service-messenger_tunnel.h
@@ -50,7 +50,7 @@ struct GNUNET_MESSENGER_SrvTunnel
 /**
  * Creates and allocates a tunnel of a <i>room</i> to a specific peer identity 
(called <i>door</i>).
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  * @param[in] door Peer identity
  * @return New tunnel
  */
@@ -61,7 +61,7 @@ create_tunnel (struct GNUNET_MESSENGER_SrvRoom *room,
 /**
  * Destroys a <i>tunnel</i> and frees its memory fully.
  *
- * @param[in/out] tunnel
+ * @param[in,out] tunnel
  */
 void
 destroy_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel);
@@ -70,8 +70,8 @@ destroy_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel);
  * Binds a CADET <i>channel</i> to a <i>tunnel</i> and replaces its channel
  * the tunnel is currently bound to if necessary.
  *
- * @param[in/out] tunnel Tunnel
- * @param[in/out] channel CADET channel
+ * @param[in,out] tunnel Tunnel
+ * @param[in,out] channel CADET channel
  */
 void
 bind_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel,
@@ -81,7 +81,7 @@ bind_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel,
  * Tries to connect a <i>tunnel</i> by creating a new CADET channel and 
binding it.
  * The function returns #GNUNET_YES on success, otherwise #GNUNET_NO.
  *
- * @param[in/out] tunnel Tunnel
+ * @param[in,out] tunnel Tunnel
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
 int
@@ -91,7 +91,7 @@ connect_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel);
  * Disconnects and unbinds a channel from a <i>tunnel</i>. The actual 
disconnection
  * will be asynchronous.
  *
- * @param[in/out] tunnel Tunnel
+ * @param[in,out] tunnel Tunnel
  */
 void
 disconnect_tunnel (struct GNUNET_MESSENGER_SrvTunnel *tunnel);
@@ -109,8 +109,8 @@ is_tunnel_connected (const struct 
GNUNET_MESSENGER_SrvTunnel *tunnel);
  * Sends an envelope containing a <i>message</i> with a given <i>hash</i> 
through
  * a <i>tunnel</i>.
  *
- * @param[in/out] tunnel Tunnel
- * @param[in/out] env Envelope
+ * @param[in,out] tunnel Tunnel
+ * @param[in,out] env Envelope
  * @param[in] hash Hash of message
  */
 void
@@ -123,9 +123,9 @@ send_tunnel_envelope (struct GNUNET_MESSENGER_SrvTunnel 
*tunnel,
  * through the <i>tunnel</i>. The used <i>handle</i> will sign the message and
  * the <i>hash</i> will be calculated and stored.
  *
- * @param[in/out] tunnel Tunnel
- * @param[in/out] handle Handle
- * @param[in/out] message Message
+ * @param[in,out] tunnel Tunnel
+ * @param[in,out] handle Handle
+ * @param[in,out] message Message
  * @return #GNUNET_YES on success, GNUNET_NO otherwise
  */
 int
@@ -136,7 +136,7 @@ send_tunnel_message (struct GNUNET_MESSENGER_SrvTunnel 
*tunnel,
 /**
  * Forwards a given <i>message</i> with a known <i>hash</i> through a 
<i>tunnel</i>.
  *
- * @param[in/out] tunnel Tunnel
+ * @param[in,out] tunnel Tunnel
  * @param[in] message Message
  * @param[in] hash Hash of message
  */
@@ -184,7 +184,7 @@ get_tunnel_messenger_version (const struct 
GNUNET_MESSENGER_SrvTunnel *tunnel);
  * it is compatible to the running peer of the service. Depending on success it
  * returns #GNUNET_OK or #GNUNET_SYSERR on failure.
  *
- * @param[in/out] tunnel Tunnel
+ * @param[in,out] tunnel Tunnel
  * @param[in] version Version of messenger
  */
 int
diff --git a/src/messenger/messenger_api_contact.h 
b/src/messenger/messenger_api_contact.h
index b5410f998..6619d8fa2 100644
--- a/src/messenger/messenger_api_contact.h
+++ b/src/messenger/messenger_api_contact.h
@@ -50,7 +50,7 @@ create_contact (const struct GNUNET_IDENTITY_PublicKey *key);
 /**
  * Destroys a contact and frees its memory fully.
  *
- * @param[in/out] contact Contact
+ * @param[in,out] contact Contact
  */
 void
 destroy_contact (struct GNUNET_MESSENGER_Contact *contact);
@@ -67,7 +67,7 @@ get_contact_name (const struct GNUNET_MESSENGER_Contact 
*contact);
 /**
  * Changes the current name of a given <i>contact</i> by copying it from the 
parameter <i>name</i>.
  *
- * @param[in/out] contact Contact
+ * @param[in,out] contact Contact
  * @param[in] name Name
  */
 void
@@ -86,7 +86,7 @@ get_contact_key (const struct GNUNET_MESSENGER_Contact 
*contact);
 /**
  * Increases the reference counter of a given <i>contact</i> which is zero as 
default.
  *
- * @param[in/out] contact Contact
+ * @param[in,out] contact Contact
  */
 void
 increase_contact_rc (struct GNUNET_MESSENGER_Contact *contact);
@@ -95,7 +95,7 @@ increase_contact_rc (struct GNUNET_MESSENGER_Contact 
*contact);
  * Decreases the reference counter if possible (can not underflow!) of a given 
<i>contact</i>
  * and returns #GNUNET_YES if the counter is equal to zero, otherwise 
#GNUNET_NO.
  *
- * @param[in/out] contact Contact
+ * @param[in,out] contact Contact
  * @return #GNUNET_YES or #GNUNET_NO depending on the reference counter
  */
 int
@@ -106,7 +106,7 @@ decrease_contact_rc (struct GNUNET_MESSENGER_Contact 
*contact);
  *
  * @param[in] key Key of room
  * @param[in] id Member id
- * @param[out] hash Member context
+ * @param[out] context Member context
  */
 void
 get_context_from_member (const struct GNUNET_HashCode *key,
diff --git a/src/messenger/messenger_api_contact_store.h 
b/src/messenger/messenger_api_contact_store.h
index bdab2ceeb..1cdd3197b 100644
--- a/src/messenger/messenger_api_contact_store.h
+++ b/src/messenger/messenger_api_contact_store.h
@@ -50,7 +50,7 @@ init_contact_store (struct GNUNET_MESSENGER_ContactStore 
*store);
 /**
  * Clears a contact store, wipes its content and deallocates its memory.
  *
- * @param[in/out] store Contact store
+ * @param[in,out] store Contact store
  */
 void
 clear_contact_store (struct GNUNET_MESSENGER_ContactStore *store);
@@ -63,7 +63,7 @@ clear_contact_store (struct GNUNET_MESSENGER_ContactStore 
*store);
  * In case there is no contact stored which uses the given key or context,
  * NULL gets returned.
  *
- * @param[in/out] store Contact store
+ * @param[in,out] store Contact store
  * @param[in] context Member context
  * @param[in] key_hash Hash of public key
  */
@@ -83,7 +83,7 @@ get_store_contact_raw (struct GNUNET_MESSENGER_ContactStore 
*store,
  * The function returns NULL if an error occurs during allocation
  * or validation of the contacts key.
  *
- * @param[in/out] store Contact store
+ * @param[in,out] store Contact store
  * @param[in] context Member context
  * @param[in] pubkey Public key of EGO
  */
@@ -98,8 +98,8 @@ get_store_contact (struct GNUNET_MESSENGER_ContactStore 
*store,
  *
  * This function allows changes of keys or changes of member contexts!
  *
- * @param[in/out] store Contact store
- * @param[in/out] contact Contact
+ * @param[in,out] store Contact store
+ * @param[in,out] contact Contact
  * @param[in] context Member context
  * @param[in] next_context Member context
  * @param[in] pubkey Public key of EGO
@@ -115,8 +115,8 @@ update_store_contact (struct GNUNET_MESSENGER_ContactStore 
*store,
  * Removes a <i>contact</i> from the <i>store</i> which uses
  * a given member <i>context</i>.
  *
- * @param[in/out] store Contact store
- * @param[in/out] contact Contact
+ * @param[in,out] store Contact store
+ * @param[in,out] contact Contact
  * @param[in] context Member context
  */
 void
diff --git a/src/messenger/messenger_api_handle.h 
b/src/messenger/messenger_api_handle.h
index 6a43f13a6..8430f40d5 100644
--- a/src/messenger/messenger_api_handle.h
+++ b/src/messenger/messenger_api_handle.h
@@ -67,7 +67,7 @@ struct GNUNET_MESSENGER_Handle
  *
  * @param[in] cfg Configuration
  * @param[in] msg_callback Message callback
- * @param[in/out] msg_cls Closure
+ * @param[in,out] msg_cls Closure
  * @return New handle
  */
 struct GNUNET_MESSENGER_Handle*
@@ -80,7 +80,7 @@ create_handle (const struct GNUNET_CONFIGURATION_Handle *cfg,
 /**
  * Destroys a <i>handle</i> and frees its memory fully from the client API.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  */
 void
 destroy_handle (struct GNUNET_MESSENGER_Handle *handle);
@@ -88,7 +88,7 @@ destroy_handle (struct GNUNET_MESSENGER_Handle *handle);
 /**
  * Sets the name of a <i>handle</i> to a specific <i>name</i>.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] name New name
  */
 void
@@ -107,7 +107,7 @@ get_handle_name (const struct GNUNET_MESSENGER_Handle 
*handle);
 /**
  * Sets the public key of a given <i>handle</i> to a specific public key.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] pubkey Public key
  */
 void
@@ -126,7 +126,7 @@ get_handle_key (const struct GNUNET_MESSENGER_Handle 
*handle);
 /**
  * Returns the used contact store of a given <i>handle</i>.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @return Contact store
  */
 struct GNUNET_MESSENGER_ContactStore*
@@ -136,7 +136,7 @@ get_handle_contact_store (struct GNUNET_MESSENGER_Handle 
*handle);
  * Returns the contact of a given <i>handle</i> in a room identified by a
  * given <i>key</i>.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] key Key of room
  * @return Contact
  */
@@ -147,7 +147,7 @@ get_handle_contact (struct GNUNET_MESSENGER_Handle *handle,
 /**
  * Marks a room known to a <i>handle</i> identified by a given <i>key</i> as 
open.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] key Key of room
  */
 void
@@ -158,7 +158,7 @@ open_handle_room (struct GNUNET_MESSENGER_Handle *handle,
  * Adds a tunnel for a room known to a <i>handle</i> identified by a given 
<i>key</i> to a
  * list of opened connections.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] door Peer identity
  * @param[in] key Key of room
  */
@@ -170,7 +170,7 @@ entry_handle_room_at (struct GNUNET_MESSENGER_Handle 
*handle,
 /**
  * Destroys and so implicitly closes a room known to a <i>handle</i> 
identified by a given <i>key</i>.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] key Key of room
  */
 void
diff --git a/src/messenger/messenger_api_list_tunnels.h 
b/src/messenger/messenger_api_list_tunnels.h
index 0e086ee5e..e28935c3e 100644
--- a/src/messenger/messenger_api_list_tunnels.h
+++ b/src/messenger/messenger_api_list_tunnels.h
@@ -55,7 +55,7 @@ init_list_tunnels (struct GNUNET_MESSENGER_ListTunnels 
*tunnels);
 /**
  * Clears the list of tunnels peer identities.
  *
- * @param[in/out] tunnels List of peer identities
+ * @param[in,out] tunnels List of peer identities
  */
 void
 clear_list_tunnels (struct GNUNET_MESSENGER_ListTunnels *tunnels);
@@ -63,7 +63,7 @@ clear_list_tunnels (struct GNUNET_MESSENGER_ListTunnels 
*tunnels);
 /**
  * Adds a specific <i>peer</i> from a tunnel to the end of the list.
  *
- * @param[in/out] tunnels List of peer identities
+ * @param[in,out] tunnels List of peer identities
  * @param[in] peer Peer identity of tunnel
  */
 void
@@ -80,7 +80,7 @@ add_to_list_tunnels (struct GNUNET_MESSENGER_ListTunnels 
*tunnels,
  * the found element in the list. If no matching element is found, 
<i>index</i> will
  * contain the total amount of elements in the list.
  *
- * @param[in/out] tunnels List of peer identities
+ * @param[in,out] tunnels List of peer identities
  * @param[in] peer Peer identity of tunnel
  * @param[out] index Index of found element (optional)
  * @return Element in the list with matching peer identity
@@ -94,7 +94,7 @@ find_list_tunnels (struct GNUNET_MESSENGER_ListTunnels 
*tunnels,
  * Tests linearly if the list of tunnels peer identities contains a specific
  * <i>peer</i> identity and returns #GNUNET_YES on success, otherwise 
#GNUNET_NO.
  *
- * @param[in/out] tunnels List of peer identities
+ * @param[in,out] tunnels List of peer identities
  * @param[in] peer Peer identity of tunnel
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
@@ -106,8 +106,8 @@ contains_list_tunnels (struct GNUNET_MESSENGER_ListTunnels 
*tunnels,
  * Removes a specific <i>element</i> from the list of tunnels peer identities 
and returns
  * the next element in the list.
  *
- * @param[in/out] tunnels List of peer identities
- * @param[in/out] element Element of the list
+ * @param[in,out] tunnels List of peer identities
+ * @param[in,out] element Element of the list
  * @return Next element in the list
  */
 struct GNUNET_MESSENGER_ListTunnel*
@@ -117,7 +117,7 @@ remove_from_list_tunnels (struct 
GNUNET_MESSENGER_ListTunnels *tunnels,
 /**
  * Loads the list of tunnels peer identities from a file under a given 
<i>path</i>.
  *
- * @param[out] messages List of hashes
+ * @param[out] tunnels List of hashes
  * @param[in] path Path of file
  */
 void
@@ -127,7 +127,7 @@ load_list_tunnels (struct GNUNET_MESSENGER_ListTunnels 
*tunnels,
 /**
  * Saves the list of tunnels peer identities to a file under a given 
<i>path</i>.
  *
- * @param[in] messages List of hashes
+ * @param[in] tunnels List of hashes
  * @param[in] path Path of file
  */
 void
diff --git a/src/messenger/messenger_api_message.h 
b/src/messenger/messenger_api_message.h
index 46c5cb024..209d80a4e 100644
--- a/src/messenger/messenger_api_message.h
+++ b/src/messenger/messenger_api_message.h
@@ -64,7 +64,7 @@ copy_message (const struct GNUNET_MESSENGER_Message *message);
 /**
  * Frees the messages body memory.
  *
- * @param[in/out] message Message
+ * @param[in,out] message Message
  */
 void
 cleanup_message (struct GNUNET_MESSENGER_Message *message);
@@ -72,7 +72,7 @@ cleanup_message (struct GNUNET_MESSENGER_Message *message);
 /**
  * Destroys a message and frees its memory fully.
  *
- * @param[in/out] message Message
+ * @param[in,out] message Message
  */
 void
 destroy_message (struct GNUNET_MESSENGER_Message *message);
@@ -163,7 +163,7 @@ hash_message (const struct GNUNET_MESSENGER_Message 
*message,
  * Signs the <i>hash</i> of a <i>message</i> with a given <i>ego</i> and 
writes the signature
  * into the <i>buffer</i> as well.
  *
- * @param[in/out] message Message
+ * @param[in,out] message Message
  * @param[in] length Length of buffer
  * @param[out] buffer Buffer
  * @param[in] hash Hash of message
@@ -196,7 +196,7 @@ verify_message (const struct GNUNET_MESSENGER_Message 
*message,
  * and kind with the now private encrypted <i>message</i>. The function returns
  * #GNUNET_YES if the operation succeeded, otherwise #GNUNET_NO.
  *
- * @param[in/out] message Message
+ * @param[in,out] message Message
  * @param[in] key Public key of EGO
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
@@ -209,7 +209,7 @@ encrypt_message (struct GNUNET_MESSENGER_Message *message,
  * and kind with the inner encrypted message. The function returns #GNUNET_YES 
if the
  * operation succeeded, otherwise #GNUNET_NO.
  *
- * @param[in/out] message Message
+ * @param[in,out] message Message
  * @param[in] key Private key of EGO
  * @return #GNUNET_YES on success, otherwise #GNUNET_NO
  */
diff --git a/src/messenger/messenger_api_room.h 
b/src/messenger/messenger_api_room.h
index 320312f0c..cf8ab782b 100644
--- a/src/messenger/messenger_api_room.h
+++ b/src/messenger/messenger_api_room.h
@@ -59,7 +59,7 @@ struct GNUNET_MESSENGER_Room
 /**
  * Creates and allocates a new room for a <i>handle</i> with a given 
<i>key</i> for the client API.
  *
- * @param[in/out] handle Handle
+ * @param[in,out] handle Handle
  * @param[in] key Key of room
  * @return New room
  */
@@ -70,7 +70,7 @@ create_room (struct GNUNET_MESSENGER_Handle *handle,
 /**
  * Destroys a room and frees its memory fully from the client API.
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  */
 void
 destroy_room (struct GNUNET_MESSENGER_Room *room);
@@ -106,8 +106,8 @@ get_room_sender (const struct GNUNET_MESSENGER_Room *room,
  * The contact of the message's sender could be updated or even created. It 
may not be freed or destroyed though!
  * (The contact may still be in use for old messages...)
  *
- * @param[in/out] room Room
- * @param[in/out] sender Contact of sender
+ * @param[in,out] room Room
+ * @param[in,out] sender Contact of sender
  * @param[in] message Message
  * @param[in] hash Hash of message
  * @return Contact of sender
@@ -122,9 +122,9 @@ handle_room_message (struct GNUNET_MESSENGER_Room *room,
  * Iterates through all members of a given <i>room</i> to forward each of them 
to a selected
  * <i>callback</i> with a custom closure.
  *
- * @param[in/out] room Room
+ * @param[in,out] room Room
  * @param[in] callback Function called for each member
- * @param[in/out] cls Closure
+ * @param[in,out] cls Closure
  * @return Amount of members iterated
  */
 int
diff --git a/src/messenger/messenger_api_util.h 
b/src/messenger/messenger_api_util.h
index af64790b6..0597b94a8 100644
--- a/src/messenger/messenger_api_util.h
+++ b/src/messenger/messenger_api_util.h
@@ -37,7 +37,7 @@
 /**
  * Starts an urgent task to close a CADET channel asynchronously.
  *
- * @param[in/out] channel Channel
+ * @param[in,out] channel Channel
  */
 void
 delayed_disconnect_channel (struct GNUNET_CADET_Channel *channel);
diff --git a/src/messenger/testing_messenger_barrier.h 
b/src/messenger/testing_messenger_barrier.h
index 3062a393a..5ea0fe137 100644
--- a/src/messenger/testing_messenger_barrier.h
+++ b/src/messenger/testing_messenger_barrier.h
@@ -62,7 +62,7 @@ typedef void
  *   GNUNET_wait_barrier().
  * @param cb the callback to call when the pseudo-barrier is reached or upon
  *   error. Can be NULL.
- * @param cls closure for the above callback
+ * @param cb_cls closure for the above callback
  * @return pseudo-barrier handle; NULL upon error
  */
 struct GNUNET_BarrierHandle*
@@ -108,7 +108,7 @@ typedef void
  *
  * @param barrier the pseudo-barrier handle
  * @param cb the pseudo-barrier wait callback
- * @param cls the closure for the above callback
+ * @param cb_cls the closure for the above callback
  * @return pseudo-barrier wait handle which can be used to cancel the waiting
  *   at anytime before the callback is called. NULL upon error.
  */

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.