Index: uspace/srv/hw/netif/dp8390/dp8390.c
===================================================================
--- uspace/srv/hw/netif/dp8390/dp8390.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
+++ uspace/srv/hw/netif/dp8390/dp8390.c	(revision a9c6b966d7358b2a28df7df4daa72fa52f1a9f35)
@@ -62,6 +62,6 @@
  *  @param[in] dep The network interface structure.
  *  @param[in] packet The outgoing packet.
- *  @returns EOK on success.
- *  @returns EINVAL 
+ *  @return EOK on success.
+ *  @return EINVAL 
  */
 int queue_packet(dpeth_t * dep, packet_t packet);
Index: uspace/srv/net/il/arp/arp.c
===================================================================
--- uspace/srv/net/il/arp/arp.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
+++ uspace/srv/net/il/arp/arp.c	(revision a9c6b966d7358b2a28df7df4daa72fa52f1a9f35)
@@ -171,6 +171,6 @@
  * @param[in] service	The protocol module service.
  * @param[in] address	The actual protocol device address.
- * @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 arp_proto_create(arp_proto_t **proto, services_t service,
@@ -205,9 +205,9 @@
  * @param[in] protocol	The protocol service.
  * @param[in] address	The actual device protocol address.
- * @returns		EOK on success.
- * @returns		EEXIST if another device with the same device identifier
+ * @return		EOK on success.
+ * @return		EEXIST if another device with the same device identifier
  *			and different driver service exists.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			measured_strings_return() function.
  */
@@ -356,6 +356,6 @@
  *  @param[in] client_connection The client connection processing function.
  *			The module skeleton propagates its own one.
- *  @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 arp_initialize(async_client_conn_t client_connection)
@@ -376,6 +376,6 @@
  * @param[in] device_id	The device identifier.
  * @param[in] mtu	The new mtu value.
- * @returns		ENOENT if device is not found.
- * @returns		EOK on success.
+ * @return		ENOENT if device is not found.
+ * @return		EOK on success.
  */
 static int arp_mtu_changed_message(device_id_t device_id, size_t mtu)
@@ -404,14 +404,14 @@
  * @param[in] device_id	The source device identifier.
  * @param[in,out] packet The received packet.
- * @returns		EOK on success and the packet is no longer needed.
- * @returns		One on success and the packet has been reused.
- * @returns		EINVAL if the packet is too small to carry an ARP
+ * @return		EOK on success and the packet is no longer needed.
+ * @return		One on success and the packet has been reused.
+ * @return		EINVAL if the packet is too small to carry an ARP
  *			packet.
- * @returns		EINVAL if the received address lengths differs from
+ * @return		EINVAL if the received address lengths differs from
  *			the registered values.
- * @returns		ENOENT if the device is not found in the cache.
- * @returns		ENOENT if the protocol for the device is not found in
+ * @return		ENOENT if the device is not found in the cache.
+ * @return		ENOENT if the protocol for the device is not found in
  *			the cache.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int arp_receive_message(device_id_t device_id, packet_t packet)
@@ -516,10 +516,10 @@
  * @param[in] protocol	The protocol service.
  * @param[in] target	The target protocol address.
- * @returns		The hardware address of the target.
- * @returns		NULL if the target parameter is NULL.
- * @returns		NULL if the device is not found.
- * @returns		NULL if the device packet is too small to send a
+ * @return		The hardware address of the target.
+ * @return		NULL if the target parameter is NULL.
+ * @return		NULL if the device is not found.
+ * @return		NULL if the device packet is too small to send a
  *			request.
- * @returns		NULL if the hardware address is not found in the cache.
+ * @return		NULL if the hardware address is not found in the cache.
  */
 static measured_string_t *
@@ -602,6 +602,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
  *
  * @see arp_interface.h
@@ -747,6 +747,6 @@
 /** Starts the module.
  *
- * @returns		EOK on success.
- * @returns		Other error codes as defined for each specific module
+ * @return		EOK on success.
+ * @return		Other error codes as defined for each specific module
  *			start function.
  */
Index: uspace/srv/net/il/ip/ip.c
===================================================================
--- uspace/srv/net/il/ip/ip.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
+++ uspace/srv/net/il/ip/ip.c	(revision a9c6b966d7358b2a28df7df4daa72fa52f1a9f35)
@@ -139,6 +139,6 @@
  * Searches the registered protocols.
  *
- * @returns		The found ICMP phone.
- * @returns		ENOENT if the ICMP is not registered.
+ * @return		The found ICMP phone.
+ * @return		ENOENT if the ICMP is not registered.
  */
 static int ip_get_icmp_phone(void)
@@ -160,13 +160,13 @@
  * @param[in] packet	The packet or the packet queue to be reported as faulty.
  * @param[in] header	The first packet IP header. May be NULL.
- * @returns		EOK on success.
- * @returns		EINVAL if there are no data in the packet.
- * @returns		EINVAL if the packet is a fragment.
- * @returns		ENOMEM if the packet is too short to contain the IP
+ * @return		EOK on success.
+ * @return		EINVAL if there are no data in the packet.
+ * @return		EINVAL if the packet is a fragment.
+ * @return		ENOMEM if the packet is too short to contain the IP
  *			header.
- * @returns		EAFNOSUPPORT if the address family is not supported.
- * @returns		EPERM if the protocol is not allowed to send ICMP
+ * @return		EAFNOSUPPORT if the address family is not supported.
+ * @return		EPERM if the protocol is not allowed to send ICMP
  *			notifications. The ICMP protocol itself.
- * @returns		Other error codes as defined for the packet_set_addr().
+ * @return		Other error codes as defined for the packet_set_addr().
  */
 static int ip_prepare_icmp(packet_t packet, ip_header_t *header)
@@ -227,8 +227,8 @@
  * @param[in] packet	The packet or the packet queue to be reported as faulty.
  * @param[in] header	The first packet IP header. May be NULL.
- * @returns		The found ICMP phone.
- * @returns		EINVAL if the error parameter is set.
- * @returns		EINVAL if the ICMP phone is not found.
- * @returns		EINVAL if the ip_prepare_icmp() fails.
+ * @return		The found ICMP phone.
+ * @return		EINVAL if the error parameter is set.
+ * @return		EINVAL if the ICMP phone is not found.
+ * @return		EINVAL if the ip_prepare_icmp() fails.
  */
 static int
@@ -248,6 +248,6 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @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 ip_initialize(async_client_conn_t client_connection)
@@ -293,17 +293,17 @@
  *
  * @param[in,out] ip_netif Network interface specific data.
- * @returns		EOK on success.
- * @returns		ENOTSUP if DHCP is configured.
- * @returns		ENOTSUP if IPv6 is configured.
- * @returns		EINVAL if any of the addresses is invalid.
- * @returns		EINVAL if the used ARP module is not known.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		ENOTSUP if DHCP is configured.
+ * @return		ENOTSUP if IPv6 is configured.
+ * @return		EINVAL if any of the addresses is invalid.
+ * @return		EINVAL if the used ARP module is not known.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			net_get_device_conf_req() function.
- * @returns		Other error codes as defined for the bind_service()
+ * @return		Other error codes as defined for the bind_service()
  *			function.
- * @returns		Other error codes as defined for the specific
+ * @return		Other error codes as defined for the specific
  *			arp_device_req() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			nil_packet_size_req() function.
  */
@@ -486,6 +486,6 @@
  * @param[in] device_id	The device identifier.
  * @param[in] mtu	The new mtu value.
- * @returns		EOK on success.
- * @returns		ENOENT if device is not found.
+ * @return		EOK on success.
+ * @return		ENOENT if device is not found.
  */
 static int ip_mtu_changed_message(device_id_t device_id, size_t mtu)
@@ -511,6 +511,6 @@
  * @param[in] device_id	The device identifier.
  * @param[in] state	The new state value.
- * @returns		EOK on success.
- * @returns		ENOENT if device is not found.
+ * @return		EOK on success.
+ * @return		ENOENT if device is not found.
  */
 static int ip_device_state_message(device_id_t device_id, device_state_t state)
@@ -539,6 +539,6 @@
  * @param[in] packet	The packet to be prefixed.
  * @param[in] last	The last header to be copied.
- * @returns		The prefixed middle header.
- * @returns		NULL on error.
+ * @return		The prefixed middle header.
+ * @return		NULL on error.
  */
 static ip_header_t *
@@ -613,10 +613,10 @@
  * @param[in,out] packet The packet to be sent.
  * @param[in] destination The destination hardware address.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is too small to contain the IP
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is too small to contain the IP
  *			header.
- * @returns		EINVAL if the packet is too long than the IP allows.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the packet_set_addr()
+ * @return		EINVAL if the packet is too long than the IP allows.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the packet_set_addr()
  *			function.
  */
@@ -746,9 +746,9 @@
  * @param[in] dest	The destiantion address.
  * @param[in] addrlen	The address length.
- * @returns		EOK on success.
- * @returns		ENOMEM if the target packet is too small.
- * @returns		Other error codes as defined for the packet_set_addr()
+ * @return		EOK on success.
+ * @return		ENOMEM if the target packet is too small.
+ * @return		Other error codes as defined for the packet_set_addr()
  *			function.
- * @returns		Other error codes as defined for the pq_insert_after()
+ * @return		Other error codes as defined for the pq_insert_after()
  *			function.
  */
@@ -799,18 +799,18 @@
  * @param[in] suffix	The minimum suffix size.
  * @param[in] addr_len	The minimum address length.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet_get_addr() function fails.
- * @returns		EINVAL if the packet does not contain the IP header.
- * @returns		EPERM if the packet needs to be fragmented and the
+ * @return		EOK on success.
+ * @return		EINVAL if the packet_get_addr() function fails.
+ * @return		EINVAL if the packet does not contain the IP header.
+ * @return		EPERM if the packet needs to be fragmented and the
  *			fragmentation is not allowed.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		ENOMEM if there is no packet available.
- * @returns		ENOMEM if the packet is too small to contain the IP
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		ENOMEM if there is no packet available.
+ * @return		ENOMEM if the packet is too small to contain the IP
  *			header.
- * @returns		Other error codes as defined for the packet_trim()
+ * @return		Other error codes as defined for the packet_trim()
  *			function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			ip_create_middle_header() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			ip_fragment_packet_data() function.
  */
@@ -919,6 +919,6 @@
  * @param[in] addr_len	The minimum address length.
  * @param[in] error	The error module service.
- * @returns		The packet or the packet queue of the allowed length.
- * @returns		NULL if there are no packets left.
+ * @return		The packet or the packet queue of the allowed length.
+ * @return		NULL if there are no packets left.
  */
 static packet_t
@@ -986,8 +986,8 @@
  * @param[in] dest	The destination address.
  * @param[in] error	The error module service.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the arp_translate_req()
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the arp_translate_req()
  *			function.
- * @returns		Other error codes as defined for the ip_prepare_packet()
+ * @return		Other error codes as defined for the ip_prepare_packet()
  *			function.
  */
@@ -1062,6 +1062,6 @@
  *			NULL.
  * @param[in] destination The destination address.
- * @returns		The found route.
- * @returns		NULL if no route was found.
+ * @return		The found route.
+ * @return		NULL if no route was found.
  */
 static ip_route_t *
@@ -1090,6 +1090,6 @@
  *
  * @param[in] destination The destination address.
- * @returns		The found route.
- * @returns		NULL if no route was found.
+ * @return		The found route.
+ * @return		NULL if no route was found.
  */
 static ip_route_t *ip_find_route(in_addr_t destination) {
@@ -1116,6 +1116,6 @@
  *
  * @param[in] netif	The network interface.
- * @returns		The IP address.
- * @returns		NULL if no IP address was found.
+ * @return		The IP address.
+ * @return		NULL if no IP address was found.
  */
 static in_addr_t *ip_netif_address(ip_netif_t *netif)
@@ -1136,10 +1136,10 @@
  * @param[in] phone	The transport layer module phone.
  * @param[in] received_msg The receiving function.
- * @returns		EOK on success.
- * @returns		EINVAL if the protocol parameter and/or the service
+ * @return		EOK on success.
+ * @return		EINVAL if the protocol parameter and/or the service
  *			parameter is zero.
- * @returns		EINVAL if the phone parameter is not a positive number
+ * @return		EINVAL if the phone parameter is not a positive number
  *			and the tl_receive_msg is NULL.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int
@@ -1361,5 +1361,5 @@
  * @param[out] content	The maximum content size.
  * @param[out] suffix	The minimum reserved suffix size.
- * @returns		EOK on success.
+ * @return		EOK on success.
  */
 static int
@@ -1418,5 +1418,5 @@
  *
  * @param[in] header	The packet IP header to be read.
- * @returns		The packet destination address.
+ * @return		The packet destination address.
  */
 static in_addr_t ip_get_destination(ip_header_t *header)
@@ -1439,13 +1439,13 @@
  * @param[in] header	The first packet IP header. May be NULL.
  * @param[in] error	The packet error service.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the packet is a fragment.
- * @returns		EAFNOSUPPORT if the address family is not supported.
- * @returns		ENOENT if the target protocol is not found.
- * @returns		Other error codes as defined for the packet_set_addr()
+ * @return		EOK on success.
+ * @return		ENOTSUP if the packet is a fragment.
+ * @return		EAFNOSUPPORT if the address family is not supported.
+ * @return		ENOENT if the target protocol is not found.
+ * @return		Other error codes as defined for the packet_set_addr()
  *			function.
- * @returns		Other error codes as defined for the packet_trim()
+ * @return		Other error codes as defined for the packet_trim()
  *			function.
- * @returns		Other error codes as defined for the protocol specific
+ * @return		Other error codes as defined for the protocol specific
  *			tl_received_msg() function.
  */
@@ -1544,10 +1544,10 @@
  * @param[in] device_id	The source device identifier.
  * @param[in] packet	The received packet to be processed.
- * @returns		EOK on success.
- * @returns		EINVAL if the TTL is less than two.
- * @returns		EINVAL if the checksum is invalid.
- * @returns		EAFNOSUPPORT if the address family is not supported.
- * @returns		ENOENT if no route was found.
- * @returns		ENOENT if the packet is for another host and the routing
+ * @return		EOK on success.
+ * @return		EINVAL if the TTL is less than two.
+ * @return		EINVAL if the checksum is invalid.
+ * @return		EAFNOSUPPORT if the address family is not supported.
+ * @return		ENOENT if no route was found.
+ * @return		ENOENT if the packet is for another host and the routing
  *			is disabled.
  */
@@ -1849,13 +1849,13 @@
  * @param[in] device_id	The source device identifier.
  * @param[in,out] packet The received packet.
- * @returns		EOK on success and the packet is no longer needed.
- * @returns		EINVAL if the packet is too small to carry the IP
+ * @return		EOK on success and the packet is no longer needed.
+ * @return		EINVAL if the packet is too small to carry the IP
  *			packet.
- * @returns		EINVAL if the received address lengths differs from the
+ * @return		EINVAL if the received address lengths differs from the
  *			registered values.
- * @returns		ENOENT if the device is not found in the cache.
- * @returns		ENOENT if the protocol for the device is not found in
+ * @return		ENOENT if the device is not found in the cache.
+ * @return		ENOENT if the protocol for the device is not found in
  *			the cache.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int ip_receive_message(device_id_t device_id, packet_t packet)
@@ -1879,6 +1879,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
  *
  * @see ip_interface.h
@@ -2037,6 +2037,6 @@
 /** Starts the module.
  *
- * @returns EOK on success.
- * @returns Other error codes as defined for each specific module start function.
+ * @return EOK on success.
+ * @return Other error codes as defined for each specific module start function.
  */
 int main(int argc, char *argv[])
Index: uspace/srv/net/net/net.c
===================================================================
--- uspace/srv/net/net/net.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
+++ uspace/srv/net/net/net.c	(revision a9c6b966d7358b2a28df7df4daa72fa52f1a9f35)
@@ -86,6 +86,6 @@
  * @param[in] value         The setting value.
  *
- * @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.
  *
  */
@@ -112,5 +112,5 @@
 /** Generate new system-unique device identifier.
  *
- * @returns		The system-unique devic identifier.
+ * @return		The system-unique devic identifier.
  */
 static device_id_t generate_new_device_id(void)
@@ -237,6 +237,6 @@
  * @param[in,out] netif The network interface structure.
  *
- * @returns EOK on success.
- * @returns Other error codes as defined for the add_configuration() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the add_configuration() function.
  *
  */
@@ -248,6 +248,6 @@
 /** Read the networking subsystem global configuration.
  *
- * @returns EOK on success.
- * @returns Other error codes as defined for the add_configuration() function.
+ * @return EOK on success.
+ * @return Other error codes as defined for the add_configuration() function.
  *
  */
@@ -264,6 +264,6 @@
  *                              its own one.
  *
- * @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.
  *
  */
@@ -315,7 +315,7 @@
  *                              its own one.
  *
- * @returns EOK on successful module termination.
- * @returns Other error codes as defined for the net_initialize() function.
- * @returns Other error codes as defined for the REGISTER_ME() macro function.
+ * @return EOK on successful module termination.
+ * @return Other error codes as defined for the net_initialize() function.
+ * @return Other error codes as defined for the REGISTER_ME() macro function.
  *
  */
@@ -360,5 +360,5 @@
  * @param[out] data          The found configuration settings data.
  *
- * @returns EOK.
+ * @return EOK.
  *
  */
@@ -422,11 +422,11 @@
  * @param[in] netif The network interface specific data.
  *
- * @returns EOK on success.
- * @returns EINVAL if there are some settings missing.
- * @returns ENOENT if the internet protocol module is not known.
- * @returns Other error codes as defined for the netif_probe_req() function.
- * @returns Other error codes as defined for the nil_device_req() function.
- * @returns Other error codes as defined for the needed internet layer
- *          registering function.
+ * @return EOK on success.
+ * @return EINVAL if there are some settings missing.
+ * @return ENOENT if the internet protocol module is not known.
+ * @return Other error codes as defined for the netif_probe_req() function.
+ * @return Other error codes as defined for the nil_device_req() function.
+ * @return Other error codes as defined for the needed internet layer
+ *         registering function.
  *
  */
@@ -514,13 +514,13 @@
 /** Read the configuration and start all network interfaces.
  *
- * @returns EOK on success.
- * @returns EXDEV if there is no available system-unique device identifier.
- * @returns EINVAL if any of the network interface names are not configured.
- * @returns ENOMEM if there is not enough memory left.
- * @returns Other error codes as defined for the read_configuration()
- *          function.
- * @returns Other error codes as defined for the read_netif_configuration()
- *          function.
- * @returns Other error codes as defined for the start_device() function.
+ * @return EOK on success.
+ * @return EXDEV if there is no available system-unique device identifier.
+ * @return EINVAL if any of the network interface names are not configured.
+ * @return ENOMEM if there is not enough memory left.
+ * @return Other error codes as defined for the read_configuration()
+ *         function.
+ * @return Other error codes as defined for the read_netif_configuration()
+ *         function.
+ * @return Other error codes as defined for the start_device() function.
  *
  */
@@ -617,6 +617,6 @@
  *                          in the answer parameter.
  *
- * @returns EOK on success.
- * @returns ENOTSUP if the message is not known.
+ * @return EOK on success.
+ * @return ENOTSUP if the message is not known.
  *
  * @see net_interface.h
Index: uspace/srv/net/netif/lo/lo.c
===================================================================
--- uspace/srv/net/netif/lo/lo.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
+++ uspace/srv/net/netif/lo/lo.c	(revision a9c6b966d7358b2a28df7df4daa72fa52f1a9f35)
@@ -103,6 +103,6 @@
  * @param[in] device	The device structure.
  * @param[in] state	The new device state.
- * @returns		The new state if changed.
- * @returns		EOK otherwise.
+ * @return		The new state if changed.
+ * @return		EOK otherwise.
  */
 static int change_state_message(netif_device_t *device, device_state_t state)
@@ -124,7 +124,7 @@
  * @param[in] device_id	The new devce identifier.
  * @param[out] device	The device structure.
- * @returns		EOK on success.
- * @returns		EXDEV if one loopback network interface already exists.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		EXDEV if one loopback network interface already exists.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int create(device_id_t device_id, netif_device_t **device)
Index: uspace/srv/net/nil/eth/eth.c
===================================================================
--- uspace/srv/net/nil/eth/eth.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
+++ uspace/srv/net/nil/eth/eth.c	(revision a9c6b966d7358b2a28df7df4daa72fa52f1a9f35)
@@ -268,12 +268,12 @@
  * @param[in] service	The device driver service.
  * @param[in] mtu	The device maximum transmission unit.
- * @returns		EOK on success.
- * @returns		EEXIST if the device with the different service exists.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EEXIST if the device with the different service exists.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			net_get_device_conf_req() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			netif_bind_service() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			netif_get_addr_req() function.
  */
@@ -422,10 +422,10 @@
  * @param[in] flags	The device flags.
  * @param[in] packet	The packet.
- * @returns		The target registered module.
- * @returns		NULL if the packet is not long enough.
- * @returns		NULL if the packet is too long.
- * @returns		NULL if the raw ethernet protocol is used.
- * @returns		NULL if the dummy device FCS checksum is invalid.
- * @returns		NULL if the packet address length is not big enough.
+ * @return		The target registered module.
+ * @return		NULL if the packet is not long enough.
+ * @return		NULL if the packet is too long.
+ * @return		NULL if the raw ethernet protocol is used.
+ * @return		NULL if the dummy device FCS checksum is invalid.
+ * @return		NULL if the packet address length is not big enough.
  */
 static eth_proto_t *eth_process_packet(int flags, packet_t packet)
@@ -552,7 +552,7 @@
  * @param[out] content	The maximum content size.
  * @param[out] suffix	The minimum reserved suffix size.
- * @returns		EOK on success.
- * @returns		EBADMEM if either one of the parameters is NULL.
- * @returns		ENOENT if there is no such device.
+ * @return		EOK on success.
+ * @return		EBADMEM if either one of the parameters is NULL.
+ * @return		ENOENT if there is no such device.
  */
 static int eth_packet_space_message(device_id_t device_id, size_t *addr_len,
@@ -586,7 +586,7 @@
  * @param[in] type	Type of the desired address.
  * @param[out] address	The device hardware address.
- * @returns		EOK on success.
- * @returns		EBADMEM if the address parameter is NULL.
- * @returns		ENOENT if there no such device.
+ * @return		EOK on success.
+ * @return		EBADMEM if the address parameter is NULL.
+ * @return		ENOENT if there no such device.
  */
 static int eth_addr_message(device_id_t device_id, eth_addr_type_t type,
@@ -620,7 +620,7 @@
  * @param[in] service	The module service.
  * @param[in] phone	The service phone.
- * @returns		EOK on success.
- * @returns		ENOENT if the service is not known.
- * @returns		ENOMEM if there is not enough memory left.
+ * @return		EOK on success.
+ * @return		ENOENT if the service is not known.
+ * @return		ENOMEM if there is not enough memory left.
  */
 static int eth_register_message(services_t service, int phone)
@@ -673,9 +673,9 @@
  * @param[in] ethertype	The ethernet protocol type.
  * @param[in] mtu	The device maximum transmission unit.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet addresses length is not long
+ * @return		EOK on success.
+ * @return		EINVAL if the packet addresses length is not long
  *			enough.
- * @returns		EINVAL if the packet is bigger than the device MTU.
- * @returns		ENOMEM if there is not enough memory in the packet.
+ * @return		EINVAL if the packet is bigger than the device MTU.
+ * @return		ENOMEM if there is not enough memory in the packet.
  */
 static int
@@ -783,7 +783,7 @@
  * @param[in] packet	The packet queue.
  * @param[in] sender	The sending module service.
- * @returns		EOK on success.
- * @returns		ENOENT if there no such device.
- * @returns		EINVAL if the service parameter is not known.
+ * @return		EOK on success.
+ * @return		ENOENT if there no such device.
+ * @return		EINVAL if the service parameter is not known.
  */
 static int eth_send_message(device_id_t device_id, packet_t packet,
Index: uspace/srv/net/nil/nildummy/nildummy.c
===================================================================
--- uspace/srv/net/nil/nildummy/nildummy.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
+++ uspace/srv/net/nil/nildummy/nildummy.c	(revision a9c6b966d7358b2a28df7df4daa72fa52f1a9f35)
@@ -142,10 +142,10 @@
  * @param[in] service	The device driver service.
  * @param[in] mtu	The device maximum transmission unit.
- * @returns		EOK on success.
- * @returns		EEXIST if the device with the different service exists.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		EEXIST if the device with the different service exists.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			netif_bind_service() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			netif_get_addr_req() function.
  */
Index: uspace/srv/net/tl/icmp/icmp.c
===================================================================
--- uspace/srv/net/tl/icmp/icmp.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
+++ uspace/srv/net/tl/icmp/icmp.c	(revision a9c6b966d7358b2a28df7df4daa72fa52f1a9f35)
@@ -100,5 +100,5 @@
  * @param[in,out] header The ICMP datagram header.
  * @param[in] length	The total datagram length.
- * @returns		The computed checksum.
+ * @return		The computed checksum.
  */
 #define ICMP_CHECKSUM(header, length) \
@@ -112,5 +112,5 @@
  * @param[in] id	The message identifier.
  * @param[in] sequence	The message sequence number.
- * @returns		The computed ICMP reply data key.
+ * @return		The computed ICMP reply data key.
  */
 #define ICMP_GET_REPLY_KEY(id, sequence) \
@@ -128,5 +128,5 @@
  * @param[in] packet	The packet queue to be released.
  * @param[in] result	The result to be returned.
- * @returns		The result parameter.
+ * @return		The result parameter.
  */
 static int icmp_release_and_return(packet_t packet, int result)
@@ -152,6 +152,6 @@
  * @param[in] dont_fragment The value indicating whether the datagram must not
  *			be fragmented. Is used as a MTU discovery.
- * @returns		EOK on success.
- * @returns		EPERM if the error message is not allowed.
+ * @return		EOK on success.
+ * @return		EPERM if the error message is not allowed.
  */
 static int icmp_send_packet(icmp_type_t type, icmp_code_t code, packet_t packet,
@@ -186,6 +186,6 @@
  *
  * @param[in,out] packet The original packet.
- * @returns The prefixed ICMP header.
- * @returns NULL on errors.
+ * @return The prefixed ICMP header.
+ * @return NULL on errors.
  */
 static icmp_header_t *icmp_prepare_packet(packet_t packet)
@@ -234,12 +234,12 @@
  * @param[in] addr	The target host address.
  * @param[in] addrlen	The torget host address length.
- * @returns		ICMP_ECHO on success.
- * @returns		ETIMEOUT if the reply has not arrived before the
+ * @return		ICMP_ECHO on success.
+ * @return		ETIMEOUT if the reply has not arrived before the
  *			timeout.
- * @returns		ICMP type of the received error notification.
- * @returns		EINVAL if the addrlen parameter is less or equal to
+ * @return		ICMP type of the received error notification.
+ * @return		EINVAL if the addrlen parameter is less or equal to
  *			zero.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		EPARTY if there was an internal error.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		EPARTY if there was an internal error.
  */
 static int icmp_echo(icmp_param_t id, icmp_param_t sequence, size_t size,
@@ -398,6 +398,6 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @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 icmp_initialize(async_client_conn_t client_connection)
@@ -507,13 +507,13 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		EINVAL if the stored packet address is not the an_addr_t.
- * @returns		EINVAL if the packet does not contain any data.
- * @returns		NO_DATA if the packet content is shorter than the user
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		EINVAL if the stored packet address is not the an_addr_t.
+ * @return		EINVAL if the packet does not contain any data.
+ * @return		NO_DATA if the packet content is shorter than the user
  *			datagram header.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		EADDRNOTAVAIL if the destination socket does not exist.
- * @returns		Other error codes as defined for the
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		EADDRNOTAVAIL if the destination socket does not exist.
+ * @return		Other error codes as defined for the
  *			ip_client_process_packet() function.
  */
@@ -654,6 +654,6 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the
  *			icmp_process_packet() function.
  */
@@ -673,15 +673,15 @@
  *
  * @param[in] call	The message parameters.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
- * @returns		Other error codes as defined for the packet_translate()
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
+ * @return		Other error codes as defined for the packet_translate()
  *			function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			icmp_destination_unreachable_msg_local() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			icmp_source_quench_msg_local() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			icmp_time_exceeded_msg_local() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			icmp_parameter_problem_msg_local() function.
  *
@@ -731,7 +731,7 @@
  *
  * @param[in,out] echo_data The echo data to be bound.
- * @returns		Index of the inserted echo data.
- * @returns		EBADMEM if the echo_data parameter is NULL.
- * @returns		ENOTCONN if no free identifier have been found.
+ * @return		Index of the inserted echo data.
+ * @return		EBADMEM if the echo_data parameter is NULL.
+ * @return		ENOTCONN if no free identifier have been found.
  */
 static int icmp_bind_free_id(icmp_echo_t *echo_data)
@@ -778,5 +778,5 @@
  * @param[in] callid	The message identifier.
  * @param[in] call	The message parameters.
- * @returns EOK.
+ * @return EOK.
  *
  * @see icmp_interface.h
@@ -887,6 +887,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
  *
  * @see icmp_interface.h
@@ -964,6 +964,6 @@
 /** Starts the module.
  *
- * @returns		EOK on success.
- * @returns		Other error codes as defined for each specific module
+ * @return		EOK on success.
+ * @return		Other error codes as defined for each specific module
  *			start function.
  */
Index: uspace/srv/net/tl/tcp/tcp.c
===================================================================
--- uspace/srv/net/tl/tcp/tcp.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
+++ uspace/srv/net/tl/tcp/tcp.c	(revision a9c6b966d7358b2a28df7df4daa72fa52f1a9f35)
@@ -224,6 +224,6 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @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 tcp_initialize(async_client_conn_t client_connection)
@@ -1222,6 +1222,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
  *
  * @see tcp_interface.h
@@ -2494,6 +2494,6 @@
 /** Starts the module.
  *
- * @returns		EOK on success.
- * @returns		Other error codes as defined for each specific module
+ * @return		EOK on success.
+ * @return		Other error codes as defined for each specific module
  *			start function.
  */
Index: uspace/srv/net/tl/udp/udp.c
===================================================================
--- uspace/srv/net/tl/udp/udp.c	(revision cc3c2a1cbf221abe6acbd9058fc3f30467b1e43b)
+++ uspace/srv/net/tl/udp/udp.c	(revision a9c6b966d7358b2a28df7df4daa72fa52f1a9f35)
@@ -97,6 +97,6 @@
  * @param[in] client_connection The client connection processing function. The
  *			module skeleton propagates its own one.
- * @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 udp_initialize(async_client_conn_t client_connection)
@@ -205,14 +205,14 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
- * @returns		EINVAL if the packet is not valid.
- * @returns		EINVAL if the stored packet address is not the
+ * @return		EOK on success.
+ * @return		EINVAL if the packet is not valid.
+ * @return		EINVAL if the stored packet address is not the
  *			an_addr_t.
- * @returns		EINVAL if the packet does not contain any data.
- * @returns 		NO_DATA if the packet content is shorter than the user
+ * @return		EINVAL if the packet does not contain any data.
+ * @return 		NO_DATA if the packet content is shorter than the user
  *			datagram header.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		EADDRNOTAVAIL if the destination socket does not exist.
- * @returns		Other error codes as defined for the
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		EADDRNOTAVAIL if the destination socket does not exist.
+ * @return		Other error codes as defined for the
  *			ip_client_process_packet() function.
  */
@@ -409,6 +409,6 @@
  * @param[in] error	The packet error reporting service. Prefixes the
  *			received packet.
- * @returns		EOK on success.
- * @returns		Other error codes as defined for the
+ * @return		EOK on success.
+ * @return		Other error codes as defined for the
  *			udp_process_packet() function.
  */
@@ -439,16 +439,16 @@
  * @param[out] data_fragment_size The data fragment size in bytes.
  * @param[in] flags	Various send flags.
- * @returns		EOK on success.
- * @returns		EAFNOTSUPPORT if the address family is not supported.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		EINVAL if the address is invalid.
- * @returns		ENOTCONN if the sending socket is not and cannot be
+ * @return		EOK on success.
+ * @return		EAFNOTSUPPORT if the address family is not supported.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		EINVAL if the address is invalid.
+ * @return		ENOTCONN if the sending socket is not and cannot be
  *			bound.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		Other error codes as defined for the
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		Other error codes as defined for the
  *			socket_read_packet_data() function.
- * @returns		Other error codes as defined for the
+ * @return		Other error codes as defined for the
  *			ip_client_prepare_packet() function.
- * @returns		Other error codes as defined for the ip_send_msg()
+ * @return		Other error codes as defined for the ip_send_msg()
  *			function.
  */
@@ -599,12 +599,12 @@
  * @param[in] flags	Various receive flags.
  * @param[out] addrlen	The source address length.
- * @returns		The number of bytes received.
- * @returns		ENOTSOCK if the socket is not found.
- * @returns		NO_DATA if there are no received packets or data.
- * @returns		ENOMEM if there is not enough memory left.
- * @returns		EINVAL if the received address is not an IP address.
- * @returns		Other error codes as defined for the packet_translate()
+ * @return		The number of bytes received.
+ * @return		ENOTSOCK if the socket is not found.
+ * @return		NO_DATA if there are no received packets or data.
+ * @return		ENOMEM if there is not enough memory left.
+ * @return		EINVAL if the received address is not an IP address.
+ * @return		Other error codes as defined for the packet_translate()
  *			function.
- * @returns		Other error codes as defined for the data_reply()
+ * @return		Other error codes as defined for the data_reply()
  *			function.
  */
@@ -698,5 +698,5 @@
  * @param[in] callid 	The message identifier.
  * @param[in] call	The message parameters.
- * @returns		EOK on success.
+ * @return		EOK on success.
  *
  * @see	socket.h
@@ -852,6 +852,6 @@
  * @param[out] answer_count The last parameter for the actual answer in the
  *			answer parameter.
- * @returns		EOK on success.
- * @returns		ENOTSUP if the message is not known.
+ * @return		EOK on success.
+ * @return		ENOTSUP if the message is not known.
  *
  * @see udp_interface.h
@@ -924,6 +924,6 @@
 /** Starts the module.
  *
- * @returns		EOK on success.
- * @returns		Other error codes as defined for each specific module
+ * @return		EOK on success.
+ * @return		Other error codes as defined for each specific module
  *			start function.
  */