2 files changed, 19 insertions, 15 deletions
diff --git a/cpukit/libcsupport/include/rtems/deviceio.h b/cpukit/libcsupport/include/rtems/deviceio.h
index df78852bb4..571b3e14ec 100644
--- a/cpukit/libcsupport/include/rtems/deviceio.h
+++ b/cpukit/libcsupport/include/rtems/deviceio.h
@@ -1,8 +1,7 @@
 /**
  * @file
  *
- * @brief Map Operations on IMFS Device Nodes to the RTEMS Classic API
- * IO Manager
+ * @brief Operations on IMFS Device Nodes 
  */
 
 /*
@@ -17,14 +16,16 @@
 #ifndef _RTEMS_DEVICEIO_H
 #define _RTEMS_DEVICEIO_H
 
+#include <rtems/libio.h>
+
 /**
- *  @defgroup Device IO Handler
- * 
+ *  @defgroup IMFSDevices IMFS Device IO Handler
  * 
- * @{
+ *  @ingroup IMFS
+ *
+ *  This contains the interface to device drivers using the RTEMS Classic API.
  */
-
-#include <rtems/libio.h>
+/**@{*/
 
 #ifdef __cplusplus
 extern "C" {
@@ -79,12 +80,11 @@ int rtems_deviceio_control(
   rtems_device_minor_number minor
 );
 
-/** @} */
-
 #ifdef __cplusplus
 }
 #endif
-
 /* __cplusplus */
 
+/**@}*/
+
 #endif /* _RTEMS_DEVICEIO_H */
diff --git a/cpukit/libcsupport/include/rtems/error.h b/cpukit/libcsupport/include/rtems/error.h
index 31a37e025b..4eae14f912 100644
--- a/cpukit/libcsupport/include/rtems/error.h
+++ b/cpukit/libcsupport/include/rtems/error.h
@@ -20,27 +20,32 @@
  * It can also include a rtems_status value which can be OR'd
  * with the above flags. *
  *
- * EXAMPLE
+ * Example 1:
+ * @code
  *  #include <rtems.h>
  *  #include <rtems/error.h>
  *  rtems_error(0, "stray interrupt %d", intr);
+ * @endcode
  *
- * EXAMPLE
+ * Example 2:
+ * @code
  *        if ((status = rtems_task_create(...)) != RTEMS_SUCCCESSFUL)
  *        {
  *            rtems_error(status | RTEMS_ERROR_ABORT,
  *                        "could not create task");
  *        }
+ * @endcode
  *
- * EXAMPLE
+ * Example 3:
+ * @code
  *        if ((fd = open(pathname, O_RDNLY)) < 0)
  *        {
  *            rtems_error(RTEMS_ERROR_ERRNO, "open of '%s' failed", pathname);
  *            goto failed;
  *        }
+ * @endcode
  */
 
-
 #ifndef _RTEMS_RTEMS_ERROR_H
 #define _RTEMS_RTEMS_ERROR_H
 
@@ -59,7 +64,6 @@ extern "C" {
  *  @brief Defines and externs for rtems error reporting
  *
  */
-
 typedef Internal_errors_t rtems_error_code_t;
 
 /*