Index: uspace/lib/net/adt/module_map.c
===================================================================
--- uspace/lib/net/adt/module_map.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/adt/module_map.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -59,6 +59,6 @@
  *			running.
  * @param[in] connect_module The module connecting function.
- * @returns		EOK on success.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int
@@ -100,7 +100,7 @@
  * @param[in] modules	The module map.
  * @param[in] name	The module name.
- * @returns		The running module found. It does not have to be
+ * @return		The running module found. It does not have to be
  *			connected.
- * @returns		NULL if there is no such module.
+ * @return		NULL if there is no such module.
  */
 module_t *get_running_module(modules_t *modules, char *name)
@@ -126,6 +126,6 @@
  *
  * @param[in] fname	The module full or relative path filename.
- * @returns		The new module task identifier on success.
- * @returns		Zero if there is no such module.
+ * @return		The new module task identifier on success.
+ * @return		Zero if there is no such module.
  */
 task_id_t spawn(const char *fname)
Index: uspace/lib/net/generic/generic.c
===================================================================
--- uspace/lib/net/generic/generic.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/generic/generic.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -92,8 +92,8 @@
  * @param[out] address	The desired address.
  * @param[out] data	The address data container.
- * @returns		EOK on success.
- * @returns		EBADMEM if the address parameter and/or the data
+ * @return		EOK on success.
+ * @return		EBADMEM if the address parameter and/or the data
  *			parameter is NULL.
- * @returns		Other error codes as defined for the specific service
+ * @return		Other error codes as defined for the specific service
  *			message.
  */
@@ -223,10 +223,10 @@
  * @param[out] translation The translated values.
  * @param[out] data	The translation data container.
- * @returns		EOK on success.
- * @returns		EINVAL if the configuration parameter is NULL.
- * @returns		EINVAL if the count parameter is zero.
- * @returns		EBADMEM if the translation or the data parameters are
+ * @return		EOK on success.
+ * @return		EINVAL if the configuration parameter is NULL.
+ * @return		EINVAL if the count parameter is zero.
+ * @return		EBADMEM if the translation or the data parameters are
  *			NULL.
- * @returns		Other error codes as defined for the specific service
+ * @return		Other error codes as defined for the specific service
  *			message.
  */
Index: uspace/lib/net/generic/net_checksum.c
===================================================================
--- uspace/lib/net/generic/net_checksum.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/generic/net_checksum.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -48,5 +48,5 @@
  *
  * @param[in] sum	Computed checksum.
- * @returns		Compacted computed checksum to the 16 bits.
+ * @return		Compacted computed checksum to the 16 bits.
  */
 uint16_t compact_checksum(uint32_t sum)
@@ -66,5 +66,5 @@
  * @param[in] data	Pointer to the beginning of data to process.
  * @param[in] length	Length of the data in bytes.
- * @returns		The computed checksum of the length bytes of the data.
+ * @return		The computed checksum of the length bytes of the data.
  */
 uint32_t compute_checksum(uint32_t seed, uint8_t *data, size_t length)
@@ -88,5 +88,5 @@
  * @param[in] data	Pointer to the beginning of data to process.
  * @param[in] length	Length of the data in bits.
- * @returns		The computed CRC32 of the length bits of the data.
+ * @return		The computed CRC32 of the length bits of the data.
  */
 uint32_t compute_crc32_be(uint32_t seed, uint8_t * data, size_t length)
@@ -142,5 +142,5 @@
  * @param[in] data	Pointer to the beginning of data to process.
  * @param[in] length	Length of the data in bits.
- * @returns		The computed CRC32 of the length bits of the data.
+ * @return		The computed CRC32 of the length bits of the data.
  */
 uint32_t compute_crc32_le(uint32_t seed, uint8_t * data, size_t length)
@@ -193,6 +193,6 @@
  *
  * @param[in] checksum	The computed checksum.
- * @returns		The internet protocol header checksum.
- * @returns		0xFFFF if the computed checksum is zero.
+ * @return		The internet protocol header checksum.
+ * @return		0xFFFF if the computed checksum is zero.
  */
 uint16_t flip_checksum(uint16_t checksum)
@@ -211,6 +211,6 @@
  * @param[in] data	The header data.
  * @param[in] length	The header length in bytes.
- * @returns		The internet protocol header checksum.
- * @returns		0xFFFF if the computed checksum is zero.
+ * @return		The internet protocol header checksum.
+ * @return		0xFFFF if the computed checksum is zero.
  */
 uint16_t ip_checksum(uint8_t *data, size_t length)
Index: uspace/lib/net/generic/net_remote.c
===================================================================
--- uspace/lib/net/generic/net_remote.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/generic/net_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -49,5 +49,5 @@
 /** Connects to the networking module.
  *
- * @returns		The networking module phone on success.
+ * @return		The networking module phone on success.
  */
 int net_connect_module(void)
@@ -83,8 +83,8 @@
  * @param[in] count	The configuration entries count.
  * @param[in,out] data	The configuration and settings data.
- * @returns		EOK on success.
- * @returns		EINVAL if the configuration is NULL.
- * @returns		EINVAL if the count is zero.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EINVAL if the configuration is NULL.
+ * @return		EINVAL if the count is zero.
+ * @return		Other error codes as defined for the
  *			generic_translate_req() function.
  */
@@ -110,8 +110,8 @@
  * @param[in] count	The configuration entries count.
  * @param[in,out] data	The configuration and settings data.
- * @returns		EOK on success.
- * @returns		EINVAL if the configuration is NULL.
- * @returns		EINVAL if the count is zero.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EINVAL if the configuration is NULL.
+ * @return		EINVAL if the count is zero.
+ * @return		Other error codes as defined for the
  *			generic_translate_req() function.
  */
Index: uspace/lib/net/generic/packet_client.c
===================================================================
--- uspace/lib/net/generic/packet_client.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/generic/packet_client.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -53,7 +53,7 @@
  * @param[in] data	The data to be copied.
  * @param[in] length	The length of the copied data.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int packet_copy_data(packet_t packet, const void *data, size_t length)
@@ -78,6 +78,6 @@
  * @param[in] length	The space length to be allocated at the beginning of the
  *			packet content.
- * @returns		The pointer to the allocated memory.
- * @returns		NULL if there is not enough memory left.
+ * @return		The pointer to the allocated memory.
+ * @return		NULL if there is not enough memory left.
  */
 void *packet_prefix(packet_t packet, size_t length)
@@ -99,6 +99,6 @@
  * @param[in] length	The space length to be allocated at the end of the
  *			 packet content.
- * @returns		The pointer to the allocated memory.
- * @returns		NULL if there is not enough memory left.
+ * @return		The pointer to the allocated memory.
+ * @return		NULL if there is not enough memory left.
  */
 void *packet_suffix(packet_t packet, size_t length)
@@ -120,7 +120,7 @@
  * @param[in] suffix	The suffix length to be removed from the end of the
  *			packet content.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int packet_trim(packet_t packet, size_t prefix, size_t suffix)
@@ -140,6 +140,6 @@
  *
  * @param[in] packet	The packet.
- * @returns		The packet identifier.
- * @returns		Zero if the packet is not valid.
+ * @return		The packet identifier.
+ * @return		Zero if the packet is not valid.
  */
 packet_id_t packet_get_id(const packet_t packet)
@@ -153,7 +153,7 @@
  * @param[out] src	The source address. May be NULL if not desired.
  * @param[out] dest	The destination address. May be NULL if not desired.
- * @returns		The stored addresses length.
- * @returns		Zero if the addresses are not present.
- * @returns		EINVAL if the packet is not valid.
+ * @return		The stored addresses length.
+ * @return		Zero if the addresses are not present.
+ * @return		EINVAL if the packet is not valid.
  */
 int packet_get_addr(const packet_t packet, uint8_t **src, uint8_t **dest)
@@ -174,6 +174,6 @@
  *
  * @param[in] packet	The packet.
- * @returns		The packet content length in bytes.
- * @returns		Zero if the packet is not valid.
+ * @return		The packet content length in bytes.
+ * @return		Zero if the packet is not valid.
  */
 size_t packet_get_data_length(const packet_t packet)
@@ -188,6 +188,6 @@
  *
  * @param[in] packet	The packet.
- * @returns		The pointer to the beginning of the packet content.
- * @returns		NULL if the packet is not valid.
+ * @return		The pointer to the beginning of the packet content.
+ * @return		NULL if the packet is not valid.
  */
 void *packet_get_data(const packet_t packet)
@@ -205,7 +205,7 @@
  * @param[in] dest	The new destination address. May be NULL.
  * @param[in] addr_len	The addresses length.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int
@@ -254,6 +254,6 @@
  * @param[in] phone	The packet server module phone.
  * @param[in] packet	The original packet.
- * @returns		The packet copy.
- * @returns		NULL on error.
+ * @return		The packet copy.
+ * @return		NULL on error.
  */
 packet_t packet_get_copy(int phone, packet_t packet)
Index: uspace/lib/net/generic/packet_remote.c
===================================================================
--- uspace/lib/net/generic/packet_remote.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/generic/packet_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -100,9 +100,9 @@
  * @param[out] packet	The packet reference.
  * @param[in] packet_id	The packet identifier.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet parameter is NULL.
- * @returns		Other error codes as defined for the NET_PACKET_GET_SIZE
+ * @return		EOK on success.
+ * @return		EINVAL if the packet parameter is NULL.
+ * @return		Other error codes as defined for the NET_PACKET_GET_SIZE
  *			message.
- * @returns		Other error codes as defined for the packet_return()
+ * @return		Other error codes as defined for the packet_return()
  *			function.
  */
@@ -145,6 +145,6 @@
  * @param[in] max_content The maximal content length in bytes.
  * @param[in] max_suffix The maximal suffix length in bytes.
- * @returns		The packet reference.
- * @returns		NULL on error.
+ * @return		The packet reference.
+ * @return		NULL on error.
  */
 packet_t packet_get_4_remote(int phone, size_t max_content, size_t addr_len,
@@ -177,6 +177,6 @@
  * @param[in] phone	The packet server module phone.
  * @param[in] content	The maximal content length in bytes.
- * @returns		The packet reference.
- * @returns		NULL on error.
+ * @return		The packet reference.
+ * @return		NULL on error.
  */
 packet_t packet_get_1_remote(int phone, size_t content)
Index: uspace/lib/net/generic/protocol_map.c
===================================================================
--- uspace/lib/net/generic/protocol_map.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/generic/protocol_map.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -42,7 +42,7 @@
  * @param[in] nil	Network interface layer service.
  * @param[in] il	Internetwork layer service.
- * @returns		Network interface layer type of the internetworking
+ * @return		Network interface layer type of the internetworking
  *			layer service.
- * @returns		Zero if mapping is not found.
+ * @return		Zero if mapping is not found.
  */
 eth_type_t protocol_map(services_t nil, services_t il)
@@ -68,7 +68,7 @@
  * @param[in] nil	Network interface layer service.
  * @param[in] protocol	Network interface layer type.
- * @returns		Internetwork layer service of the network interface
+ * @return		Internetwork layer service of the network interface
  *			layer type.
- * @returns		Zero if mapping is not found.
+ * @return		Zero if mapping is not found.
  */
 services_t protocol_unmap(services_t nil, int protocol)
@@ -94,7 +94,7 @@
  *
  * @param[in] lsap	Link service access point identifier.
- * @returns		Ethernet protocol identifier of the link service access
+ * @return		Ethernet protocol identifier of the link service access
  *			point identifier.
- * @returns		ETH_LSAP_NULL if mapping is not found.
+ * @return		ETH_LSAP_NULL if mapping is not found.
  */
 eth_type_t lsap_map(eth_lsap_t lsap)
@@ -114,6 +114,6 @@
  *
  * @param[in] ethertype	Ethernet protocol identifier.
- * @returns		Link service access point identifier.
- * @returns		Zero if mapping is not found.
+ * @return		Link service access point identifier.
+ * @return		Zero if mapping is not found.
  */
 eth_lsap_t lsap_unmap(eth_type_t ethertype)
@@ -132,6 +132,6 @@
  *
  * @param[in] nil	The network interface service.
- * @returns		The hardware type of the network interface service.
- * @returns		Zero if mapping is not found.
+ * @return		The hardware type of the network interface service.
+ * @return		Zero if mapping is not found.
  */
 hw_type_t hardware_map(services_t nil)
Index: uspace/lib/net/il/arp_remote.c
===================================================================
--- uspace/lib/net/il/arp_remote.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/il/arp_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -52,5 +52,5 @@
  *
  * @param service	The ARP module service. Ignored parameter.
- * @returns		The ARP module phone on success.
+ * @return		The ARP module phone on success.
  */
 int arp_connect_module(services_t service)
@@ -65,5 +65,5 @@
  *
  * @param[in] arp_phone	The ARP module phone used for (semi)remote calls.
- * @returns		EOK on success.
+ * @return		EOK on success.
  */
 int arp_clean_cache_req(int arp_phone)
@@ -78,6 +78,6 @@
  * @param[in] protocol	The requesting protocol service.
  * @param[in] address	The protocol address to be cleared.
- * @returns		EOK on success.
- * @returns		ENOENT if the mapping is not found.
+ * @return		EOK on success.
+ * @return		ENOENT if the mapping is not found.
  */
 int
@@ -100,6 +100,6 @@
  * @param[in] arp_phone	The ARP module phone used for (semi)remote calls.
  * @param[in] device_id	The device identifier.
- * @returns		EOK on success.
- * @returns		ENOENT if the device is not found.
+ * @return		EOK on success.
+ * @return		ENOENT if the device is not found.
  */
 int arp_clear_device_req(int arp_phone, device_id_t device_id)
@@ -119,15 +119,15 @@
  * @param[in] netif	The underlying device network interface layer service.
  * @param[in] address	The local requesting protocol address of the device.
- * @returns		EOK on success.
- * @returns		EEXIST if the device is already used.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		ENOENT if the network interface service is not known.
- * @returns		EREFUSED if the network interface service is not
+ * @return		EOK on success.
+ * @return		EEXIST if the device is already used.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		ENOENT if the network interface service is not known.
+ * @return		EREFUSED if the network interface service is not
  *			responding.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			nil_packet_get_size() function.
- * @returns		Other error codes as defined for the nil_get_addr()
+ * @return		Other error codes as defined for the nil_get_addr()
  *			function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			nil_get_broadcast_addr() function.
  */
@@ -157,9 +157,9 @@
  * @param[out] translation The translation of the local protocol address.
  * @param[out] data	The allocated raw translation data container.
- * @returns		EOK on success.
- * @returns		EINVAL if the address parameter is NULL.
- * @returns		EBADMEM if the translation or the data parameters are
+ * @return		EOK on success.
+ * @return		EINVAL if the address parameter is NULL.
+ * @return		EBADMEM if the translation or the data parameters are
  *			NULL.
- * @returns		ENOENT if the mapping is not found.
+ * @return		ENOENT if the mapping is not found.
  */
 int
Index: uspace/lib/net/il/ip_client.c
===================================================================
--- uspace/lib/net/il/ip_client.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/il/ip_client.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -48,6 +48,6 @@
  *
  * @param[in] packet	The packet.
- * @returns		The IP header length in bytes.
- * @returns		Zero if there is no IP header.
+ * @return		The IP header length in bytes.
+ * @return		Zero if there is no IP header.
  */
 size_t ip_client_header_length(packet_t packet)
@@ -72,17 +72,17 @@
  * @param[out] header	The constructed IPv4 pseudo header.
  * @param[out] headerlen The length of the IP pseudo header in bytes.
- * @returns		EOK on success.
- * @returns		EBADMEM if the header and/or the headerlen parameter is
+ * @return		EOK on success.
+ * @return		EBADMEM if the header and/or the headerlen parameter is
  *			NULL.
- * @returns		EINVAL if the source address and/or the destination
+ * @return		EINVAL if the source address and/or the destination
  *			address parameter is NULL.
- * @returns		EINVAL if the source address length is less than struct
+ * @return		EINVAL if the source address length is less than struct
  *			sockaddr length.
- * @returns		EINVAL if the source address length differs from the
+ * @return		EINVAL if the source address length differs from the
  *			destination address length.
- * @returns		EINVAL if the source address family differs from the
+ * @return		EINVAL if the source address family differs from the
  *			destination family.
- * @returns		EAFNOSUPPORT if the address family is not supported.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EAFNOSUPPORT if the address family is not supported.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int
@@ -148,6 +148,6 @@
  *			disabled.
  * @param[in] ipopt_length The prefixed IP options length in bytes.
- * @returns		EOK on success.
- * @returns		ENOMEM if there is not enough memory left in the packet.
+ * @return		EOK on success.
+ * @return		ENOMEM if there is not enough memory left in the packet.
  */
 int
@@ -203,6 +203,6 @@
  * @param[out] ipopt_length The IP options length in bytes. May be NULL if not
  *			desired.
- * @returns		The prefixed IP header length in bytes on success.
- * @returns		ENOMEM if the packet is too short to contain the IP
+ * @return		The prefixed IP header length in bytes on success.
+ * @return		ENOMEM if the packet is too short to contain the IP
  *			header.
  */
@@ -238,7 +238,7 @@
  * @param[in] headerlen	The length of the IP pseudo header in bytes.
  * @param[in] data_length The data length to be set.
- * @returns		EOK on success.
- * @returns		EBADMEM if the header parameter is NULL.
- * @returns		EINVAL if the headerlen parameter is not IPv4 pseudo
+ * @return		EOK on success.
+ * @return		EBADMEM if the header parameter is NULL.
+ * @return		EINVAL if the headerlen parameter is not IPv4 pseudo
  *			header length.
  */
Index: uspace/lib/net/il/ip_remote.c
===================================================================
--- uspace/lib/net/il/ip_remote.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/il/ip_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -78,7 +78,7 @@
  * @param[in] me	The requesting module service.
  * @param[in] receiver	The message receiver. Used for remote connection.
- * @returns		The phone of the needed service.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the bind_service()
+ * @return		The phone of the needed service.
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the bind_service()
  *			function.
  */
@@ -93,5 +93,5 @@
  *
  * @param service	The IP module service. Ignored parameter.
- * @returns		The IP module phone on success.
+ * @return		The IP module phone on success.
  */
 int ip_connect_module(services_t service)
Index: uspace/lib/net/include/il_local.h
===================================================================
--- uspace/lib/net/include/il_local.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/include/il_local.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -44,6 +44,6 @@
  * @param[out]		answer_count The last parameter for the actual answer in
  *			the answer parameter.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the arp_message()
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the arp_message()
  *			function.
  */
@@ -59,8 +59,8 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @returns		EOK on successful module termination.
- * @returns		Other error codes as defined for the arp_initialize()
+ * @return		EOK on successful module termination.
+ * @return		Other error codes as defined for the arp_initialize()
  *			function.
- * @returns		Other error codes as defined for the REGISTER_ME() macro
+ * @return		Other error codes as defined for the REGISTER_ME() macro
  *			function.
  */
Index: uspace/lib/net/include/ip_interface.h
===================================================================
--- uspace/lib/net/include/ip_interface.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/include/ip_interface.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -68,5 +68,5 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
+ * @return		EOK on success.
  */
 typedef int (*tl_received_msg_t)(device_id_t device_id, packet_t packet,
Index: uspace/lib/net/include/packet_client.h
===================================================================
--- uspace/lib/net/include/packet_client.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/include/packet_client.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -61,7 +61,7 @@
  * @param[in] type	The type to be allocated at the beginning of the packet
  *			content.
- * @returns		The typed pointer to the allocated memory.
- * @returns		NULL if the packet is not valid.
- * @returns		NULL if there is not enough memory left.
+ * @return		The typed pointer to the allocated memory.
+ * @return		NULL if the packet is not valid.
+ * @return		NULL if there is not enough memory left.
  */
 #define PACKET_PREFIX(packet, type) \
@@ -76,7 +76,7 @@
  * @param[in] type	The type to be allocated at the end of the packet
  *			content.
- * @returns		The typed pointer to the allocated memory.
- * @returns		NULL if the packet is not valid.
- * @returns		NULL if there is not enough memory left.
+ * @return		The typed pointer to the allocated memory.
+ * @return		NULL if the packet is not valid.
+ * @return		NULL if there is not enough memory left.
  */
 #define PACKET_SUFFIX(packet, type) \
@@ -92,7 +92,7 @@
  * @param[in] suffix	The type of the suffix to be removed from the end of
  *			the packet content.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		ENOMEM if there is not enough memory left.
  */
 #define PACKET_TRIM(packet, prefix, suffix) \
Index: uspace/lib/net/include/tl_local.h
===================================================================
--- uspace/lib/net/include/tl_local.h	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/include/tl_local.h	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -45,8 +45,8 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @returns		EOK on successful module termination.
- * @returns		Other error codes as defined for the module initialize
+ * @return		EOK on successful module termination.
+ * @return		Other error codes as defined for the module initialize
  *			function.
- * @returns		Other error codes as defined for the REGISTER_ME() macro
+ * @return		Other error codes as defined for the REGISTER_ME() macro
  *			function.
  */
@@ -62,6 +62,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the module's message
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the module's message
  *			standalone function.
  */
Index: uspace/lib/net/tl/icmp_client.c
===================================================================
--- uspace/lib/net/tl/icmp_client.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/tl/icmp_client.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -57,6 +57,6 @@
  * @param[out] pointer	The ICMP header pointer.
  * @param[out] mtu	The ICMP header MTU.
- * @returns		The ICMP header length.
- * @returns		Zero if the packet contains no data.
+ * @return		The ICMP header length.
+ * @return		Zero if the packet contains no data.
  */
 int
@@ -92,5 +92,5 @@
  *
  * @param[in] packet	The packet.
- * @returns		The ICMP header length in bytes.
+ * @return		The ICMP header length in bytes.
  */
 size_t icmp_client_header_length(packet_t packet)
Index: uspace/lib/net/tl/icmp_remote.c
===================================================================
--- uspace/lib/net/tl/icmp_remote.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/tl/icmp_remote.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -57,7 +57,7 @@
  * @param[in] mtu	The error MTU value.
  * @param[in] packet	The original packet.
- * @returns		EOK on success.
- * @returns		EPERM if the ICMP error notifications are disabled.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EPERM if the ICMP error notifications are disabled.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int
@@ -78,7 +78,7 @@
  * @param[in] icmp_phone The ICMP module phone used for (semi)remote calls.
  * @param[in] packet	The original packet.
- * @returns		EOK on success.
- * @returns		EPERM if the ICMP error notifications are disabled.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EPERM if the ICMP error notifications are disabled.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int icmp_source_quench_msg(int icmp_phone, packet_t packet)
@@ -98,7 +98,7 @@
  * @param[in] code	The error specific code.
  * @param[in] packet	The original packet.
- * @returns		EOK on success.
- * @returns		EPERM if the ICMP error notifications are disabled.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EPERM if the ICMP error notifications are disabled.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int icmp_time_exceeded_msg(int icmp_phone, icmp_code_t code, packet_t packet)
@@ -119,7 +119,7 @@
  * @param[in] pointer	The problematic parameter offset.
  * @param[in] packet	The original packet.
- * @returns		EOK on success.
- * @returns		EPERM if the ICMP error notifications are disabled.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EPERM if the ICMP error notifications are disabled.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int icmp_parameter_problem_msg(int icmp_phone, icmp_code_t code,
Index: uspace/lib/net/tl/socket_core.c
===================================================================
--- uspace/lib/net/tl/socket_core.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/tl/socket_core.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -156,6 +156,6 @@
  * @param[in] key	The socket key identifier.
  * @param[in] key_length The socket key length.
- * @returns		EOK on success.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int
@@ -194,7 +194,7 @@
  * @param[in] socket	The socket to be added.
  * @param[in] port	The port number to be bound to.
- * @returns		EOK on success.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			 socket_ports_add() function.
  */
@@ -248,11 +248,11 @@
  * @param[in] free_ports_end The maximum free port.
  * @param[in] last_used_port The last used free port.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket was not found.
- * @returns		EAFNOSUPPORT if the address family is not supported.
- * @returns		EADDRINUSE if the port is already in use.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket was not found.
+ * @return		EAFNOSUPPORT if the address family is not supported.
+ * @return		EADDRINUSE if the port is already in use.
+ * @return		Other error codes as defined for the
  *			socket_bind_free_port() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			socket_bind_insert() function.
  */
@@ -322,7 +322,7 @@
  * @param[in] free_ports_end The maximum free port.
  * @param[in] last_used_port The last used free port.
- * @returns		EOK on success.
- * @returns		ENOTCONN if no free port was found.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOTCONN if no free port was found.
+ * @return		Other error codes as defined for the
  *			socket_bind_insert() function.
  */
@@ -367,6 +367,6 @@
  *			requested. A negative identifier is requested if set to
  *			false.
- * @returns		The new socket identifier.
- * @returns		ELIMIT if there is no socket identifier available.
+ * @return		The new socket identifier.
+ * @return		ELIMIT if there is no socket identifier available.
  */
 static int socket_generate_new_id(socket_cores_t *local_sockets, int positive)
@@ -410,7 +410,7 @@
  *			chosen if set to zero or negative. A negative identifier
  *			is chosen if set to negative.
- * @returns		EOK on success.
- * @returns		EINVAL if the socket_id parameter is NULL.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EINVAL if the socket_id parameter is NULL.
+ * @return		ENOMEM if there is not enough memory left.
  */
 int
@@ -482,6 +482,6 @@
  * @param[in,out] global_sockets The global sockets to be updated.
  * @param[in] socket_release The client release callback function.
- * @returns		EOK on success.
- * @returns		ENOTSOCK if the socket is not found.
+ * @return		EOK on success.
+ * @return		ENOTSOCK if the socket is not found.
  */
 int
@@ -516,8 +516,8 @@
  * @param[in] packet	The packet to be transfered.
  * @param[out] length	The total data length.
- * @returns		EOK on success.
- * @returns		EBADMEM if the length parameter is NULL.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the data_reply()
+ * @return		EOK on success.
+ * @return		EBADMEM if the length parameter is NULL.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the data_reply()
  *			function.
  */
@@ -598,6 +598,6 @@
  * @param[in] key	The socket key identifier.
  * @param[in] key_length The socket key length.
- * @returns		The found socket.
- * @returns		NULL if no socket was found.
+ * @return		The found socket.
+ * @return		NULL if no socket was found.
  */
 socket_core_t *
@@ -673,7 +673,7 @@
  * @param[in] key	The socket key identifier.
  * @param[in] key_length The socket key length.
- * @returns		EOK on success.
- * @returns		ENOENT if the port is not already used.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOENT if the port is not already used.
+ * @return		Other error codes as defined for the
  *			socket_port_add_core() function.
  */
Index: uspace/lib/net/tl/tl_common.c
===================================================================
--- uspace/lib/net/tl/tl_common.c	(revision aaa3f33ad2cc7b8a1f42205ed0c585a630c45481)
+++ uspace/lib/net/tl/tl_common.c	(revision fdbc3ff84ed86b1d20bebbe6c6235ecc5954f606)
@@ -64,8 +64,8 @@
  * @param[in] addrlen	The address length.
  * @param[out] port	The set port.
- * @returns		EOK on success.
- * @returns		EINVAL if the address length does not match the address
+ * @return		EOK on success.
+ * @return		EINVAL if the address length does not match the address
  *			family.
- * @returns		EAFNOSUPPORT if the address family is not supported.
+ * @return		EAFNOSUPPORT if the address family is not supported.
  */
 int
@@ -158,5 +158,5 @@
  * @param[in] device_id	The device identifier.
  * @param[in] content	The new maximum content size.
- * @returns		EOK on success.
+ * @return		EOK on success.
  * @return		ENOENT if the packet dimension is not cached.
  */
@@ -196,8 +196,8 @@
  * @param[in] addrlen	The address length.
  * @param[in] port	The port to be set.
- * @returns		EOK on success.
- * @returns		EINVAL if the address length does not match the address
+ * @return		EOK on success.
+ * @return		EINVAL if the address length does not match the address
  *			family.
- * @returns		EAFNOSUPPORT if the address family is not supported.
+ * @return		EAFNOSUPPORT if the address family is not supported.
  */
 int tl_set_address_port(struct sockaddr * addr, int addrlen, uint16_t port)
@@ -244,6 +244,6 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
- * @returns		ENOENT if no packet may be sent.
+ * @return		EOK on success.
+ * @return		ENOENT if no packet may be sent.
  */
 int
@@ -280,8 +280,8 @@
  * @param[in] addr	The destination address.
  * @param[in] addrlen	The address length.
- * @returns		Number of bytes received.
- * @returns		EINVAL if the client does not send data.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		Number of bytes received.
+ * @return		EINVAL if the client does not send data.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			async_data_read_finalize() function.
  */