Index: cpukit/sapi/include/confdefs.h
===================================================================
--- cpukit/sapi/include/confdefs.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/confdefs.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,30 +1,30 @@
 /**
- * @file rtems/confdefs.h
+ * @file
  *
  * @brief Configuration Table Template that will be Instantiated
  * by an Application
  *
- *  This include file contains the configuration table template that will
- *  be instantiated by an application based on the setting of a number
- *  of macros.  The macros are documented in the Configuring a System
- *  chapter of the Classic API User's Guide
- *
- *  The model is to estimate the memory required for each configured item
- *  and sum those estimates.  The estimate can be too high or too low for
- *  a variety of reasons:
- *
- *  Reasons estimate is too high:
- *    + FP contexts (not all tasks are FP)
- *
- *  Reasons estimate is too low:
- *    + stacks greater than minimum size
- *    + messages
- *    + application must account for device driver resources
- *    + application must account for add-on library resource requirements
- *
- *  NOTE:  Eventually this may be able to take into account some of
- *         the above.  This procedure has evolved from just enough to
- *         support the RTEMS Test Suites into something that can be
- *         used remarkably reliably by most applications.
+ * This include file contains the configuration table template that will
+ * be instantiated by an application based on the setting of a number
+ * of macros.  The macros are documented in the Configuring a System
+ * chapter of the Classic API User's Guide
+ *
+ * The model is to estimate the memory required for each configured item
+ * and sum those estimates.  The estimate can be too high or too low for
+ * a variety of reasons:
+ *
+ * Reasons estimate is too high:
+ *   + FP contexts (not all tasks are FP)
+ *
+ * Reasons estimate is too low:
+ *   + stacks greater than minimum size
+ *   + messages
+ *   + application must account for device driver resources
+ *   + application must account for add-on library resource requirements
+ *
+ * NOTE:  Eventually this may be able to take into account some of
+ *        the above.  This procedure has evolved from just enough to
+ *        support the RTEMS Test Suites into something that can be
+ *        used remarkably reliably by most applications.
  */
 
@@ -62,6 +62,6 @@
 
 /**
- *  This macro determines whether the RTEMS reentrancy support for
- *  the Newlib C Library is enabled.
+ * This macro determines whether the RTEMS reentrancy support for
+ * the Newlib C Library is enabled.
  */
 #ifdef RTEMS_SCHEDSIM
@@ -111,7 +111,7 @@
 
 /**
- *  This macro defines the number of POSIX file descriptors allocated
- *  and managed by libio.  These are the "integer" file descriptors that
- *  are used by calls like open(2) and read(2).
+ * This macro defines the number of POSIX file descriptors allocated
+ * and managed by libio.  These are the "integer" file descriptors that
+ * are used by calls like open(2) and read(2).
  */
 #ifndef CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS
@@ -120,5 +120,5 @@
 
 /**
- *  Semaphore count used by the IO library.
+ * Semaphore count used by the IO library.
  */
 #define CONFIGURE_LIBIO_SEMAPHORES 1
@@ -126,6 +126,6 @@
 #ifdef CONFIGURE_INIT
   /**
-   *  When instantiating the configuration tables, this variable is
-   *  initialized to specify the maximum number of file descriptors.
+   * When instantiating the configuration tables, this variable is
+   * initialized to specify the maximum number of file descriptors.
    */
   uint32_t rtems_libio_number_iops = CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS;
@@ -133,7 +133,7 @@
 
 /**
- *  This macro determines if termios is disabled by this application.
- *  This only means that resources will not be reserved.  If you end
- *  up using termios, it will fail.
+ * This macro determines if termios is disabled by this application.
+ * This only means that resources will not be reserved.  If you end
+ * up using termios, it will fail.
  */
 #ifdef CONFIGURE_TERMIOS_DISABLED
@@ -141,6 +141,6 @@
 #else
   /**
-   *  This macro specifies the number of serial or PTY ports that will
-   *  use termios.
+   * This macro specifies the number of serial or PTY ports that will
+   * use termios.
    */
   #ifndef CONFIGURE_NUMBER_OF_TERMIOS_PORTS
@@ -149,6 +149,6 @@
 
   /**
-   *  This macro reserves the number of semaphores required by termios
-   *  based upon the number of communication ports that will use it.
+   * This macro reserves the number of semaphores required by termios
+   * based upon the number of communication ports that will use it.
    */
   #define CONFIGURE_TERMIOS_SEMAPHORES \
@@ -157,6 +157,6 @@
 
 /**
- *  This macro specifies the number of PTYs that can be concurrently
- *  active.
+ * This macro specifies the number of PTYs that can be concurrently
+ * active.
  */
 #ifndef CONFIGURE_MAXIMUM_PTYS
@@ -165,6 +165,6 @@
 
 /**
- *  This variable contains the maximum number of PTYs that can be
- *  concurrently active.
+ * This variable contains the maximum number of PTYs that can be
+ * concurrently active.
  */
 #ifdef CONFIGURE_INIT
@@ -289,8 +289,8 @@
 
 /**
- *  This specifies the number of bytes per block for files within the IMFS.
- *  There are a maximum number of blocks per file so this dictates the maximum
- *  size of a file.  This has to be balanced with the unused portion of each
- *  block that might be wasted.
+ * This specifies the number of bytes per block for files within the IMFS.
+ * There are a maximum number of blocks per file so this dictates the maximum
+ * size of a file.  This has to be balanced with the unused portion of each
+ * block that might be wasted.
  */
 #ifndef CONFIGURE_IMFS_MEMFILE_BYTES_PER_BLOCK
@@ -300,5 +300,5 @@
 
 /**
- *  This defines the miniIMFS file system table entry.
+ * This defines the miniIMFS file system table entry.
  */
 #if !defined(CONFIGURE_FILESYSTEM_ENTRY_miniIMFS) && \
@@ -310,5 +310,5 @@
 
 /**
- *  Internall it is called FIFOs not pipes
+ * Internall it is called FIFOs not pipes
  */
 #if defined(CONFIGURE_PIPES_ENABLED)
@@ -318,5 +318,5 @@
 #ifndef RTEMS_SCHEDSIM
 /**
- *  This defines the IMFS file system table entry.
+ * This defines the IMFS file system table entry.
  */
 #if !defined(CONFIGURE_FILESYSTEM_ENTRY_IMFS) && \
@@ -333,5 +333,5 @@
 
 /**
- *  This sets up the resources for the PIPES/FIFOs
+ * This sets up the resources for the PIPES/FIFOs
  */
 #if defined(CONFIGURE_FIFOS_ENABLED)
@@ -419,11 +419,11 @@
 
   /**
-   *  DEVFS variables.
+   * DEVFS variables.
    *
-   *  The number of individual devices that may be registered
-   *  in the system or the CONFIGURE_MAXIMUM_DEVICES variable
-   *  is defaulted to 4 when a filesystem is enabled, unless
-   *  the bsp overwrides this.  In which case the value is set
-   *  to BSP_MAXIMUM_DEVICES.
+   * The number of individual devices that may be registered
+   * in the system or the CONFIGURE_MAXIMUM_DEVICES variable
+   * is defaulted to 4 when a filesystem is enabled, unless
+   * the bsp overwrides this.  In which case the value is set
+   * to BSP_MAXIMUM_DEVICES.
    */
   #ifdef CONFIGURE_FILESYSTEM_DEVFS
@@ -533,5 +533,5 @@
 
 /**
- *  This configures the stack checker user extension.
+ * This configures the stack checker user extension.
  */
 #ifdef CONFIGURE_STACK_CHECKER_ENABLED
@@ -542,32 +542,32 @@
 
 /**
- *  @brief Maximum Priority configuration
- *
- *  This configures the maximum priority value that
- *  a task may have.
- *
- *  The following applies to the data space requirements
- *  of the Priority Scheduler.
- *
- *  By reducing the number of priorities in a system,
- *  the amount of RAM required by RTEMS can be significantly
- *  reduced.  RTEMS allocates a Chain_Control structure per
- *  priority and this structure contains 3 pointers.  So
- *  the default is (256 * 12) = 3K on 32-bit architectures.
- *
- *  This must be one less than a power of 2 between
- *  4 and 256.  Valid values along with the application
- *  priority levels and memory saved when pointers are
- *  32-bits in size are:
- *
- *    + 3,  2 application priorities, 3024 bytes saved
- *    + 7, 5 application priorities, 2976 bytes saved
- *    + 15, 13 application priorities, 2880 bytes saved
- *    + 31, 29 application priorities, 2688 bytes saved
- *    + 63, 61 application priorities, 2304 bytes saved
- *    + 127, 125 application priorities, 1536 bytes saved
- *    + 255, 253 application priorities, 0 bytes saved
- *
- *  It is specified in terms of Classic API priority values.
+ * @brief Maximum priority configuration.
+ *
+ * This configures the maximum priority value that
+ * a task may have.
+ *
+ * The following applies to the data space requirements
+ * of the Priority Scheduler.
+ *
+ * By reducing the number of priorities in a system,
+ * the amount of RAM required by RTEMS can be significantly
+ * reduced.  RTEMS allocates a Chain_Control structure per
+ * priority and this structure contains 3 pointers.  So
+ * the default is (256 * 12) = 3K on 32-bit architectures.
+ *
+ * This must be one less than a power of 2 between
+ * 4 and 256.  Valid values along with the application
+ * priority levels and memory saved when pointers are
+ * 32-bits in size are:
+ *
+ *   + 3,  2 application priorities, 3024 bytes saved
+ *   + 7, 5 application priorities, 2976 bytes saved
+ *   + 15, 13 application priorities, 2880 bytes saved
+ *   + 31, 29 application priorities, 2688 bytes saved
+ *   + 63, 61 application priorities, 2304 bytes saved
+ *   + 127, 125 application priorities, 1536 bytes saved
+ *   + 255, 253 application priorities, 0 bytes saved
+ *
+ * It is specified in terms of Classic API priority values.
  */
 #ifndef CONFIGURE_MAXIMUM_PRIORITY
@@ -730,10 +730,10 @@
 
 /**
- *  @brief Idle task body configuration
- *
- *  There is a default IDLE thread body provided by RTEMS which
- *  has the possibility of being CPU specific.  There may be a
- *  BSP specific override of the RTEMS default body and in turn,
- *  the application may override and provide its own.
+ * @brief Idle task body configuration.
+ *
+ * There is a default IDLE thread body provided by RTEMS which
+ * has the possibility of being CPU specific.  There may be a
+ * BSP specific override of the RTEMS default body and in turn,
+ * the application may override and provide its own.
  */
 #ifndef CONFIGURE_IDLE_TASK_BODY
@@ -756,5 +756,5 @@
 
 /**
- *  By default, use the minimum stack size requested by this port.
+ * By default, use the minimum stack size requested by this port.
  */
 #ifndef CONFIGURE_MINIMUM_TASK_STACK_SIZE
@@ -766,8 +766,8 @@
 
 /**
- *  @brief Idle task stack size configuration
- *
- *  By default, the IDLE task will have a stack of minimum size.
- *  The BSP or application may override this value.
+ * @brief Idle task stack size configuration.
+ *
+ * By default, the IDLE task will have a stack of minimum size.
+ * The BSP or application may override this value.
  */
 #ifndef CONFIGURE_IDLE_TASK_STACK_SIZE
@@ -783,8 +783,8 @@
 
 /**
- *  @brief Interrupt stack size configuration
- *
- *  By default, the interrupt stack will be of minimum size.
- *  The BSP or application may override this value.
+ * @brief Interrupt stack size configuration.
+ *
+ * By default, the interrupt stack will be of minimum size.
+ * The BSP or application may override this value.
  */
 #ifndef CONFIGURE_INTERRUPT_STACK_SIZE
@@ -797,9 +797,9 @@
 
 /**
- *  This reserves memory for the interrupt stack if it is to be allocated
- *  by RTEMS rather than the BSP.
- *
- *  @todo Try to get to the point where all BSPs support allocating the
- *        memory from the Workspace.
+ * This reserves memory for the interrupt stack if it is to be allocated
+ * by RTEMS rather than the BSP.
+ *
+ * @todo Try to get to the point where all BSPs support allocating the
+ *       memory from the Workspace.
  */
 #if (CPU_ALLOCATE_INTERRUPT_STACK == 0)
@@ -811,5 +811,5 @@
 
 /**
- *  Configure the very much optional task stack allocator initialization
+ * Configure the very much optional task stack allocator initialization
  */
 #ifndef CONFIGURE_TASK_STACK_ALLOCATOR_INIT
@@ -832,6 +832,6 @@
 
 /**
- *  Should the RTEMS Workspace and C Program Heap be cleared automatically
- *  at system start up?
+ * Should the RTEMS Workspace and C Program Heap be cleared automatically
+ * at system start up?
  */
 #ifndef CONFIGURE_ZERO_WORKSPACE_AUTOMATICALLY
@@ -852,8 +852,8 @@
 #ifdef CONFIGURE_INIT
   /**
-   *  By default, RTEMS uses separate heaps for the RTEMS Workspace and
-   *  the C Program Heap.  On many BSPs, these can be optionally
-   *  combined provided one larger memory pool. This is particularly
-   *  useful in combination with the unlimited objects configuration.
+   * By default, RTEMS uses separate heaps for the RTEMS Workspace and
+   * the C Program Heap.  On many BSPs, these can be optionally
+   * combined provided one larger memory pool. This is particularly
+   * useful in combination with the unlimited objects configuration.
    */
   #ifdef BSP_DEFAULT_UNIFIED_WORK_AREAS
@@ -873,6 +873,6 @@
 #ifdef CONFIGURE_INIT
   /**
-   *  This configures the malloc family statistics to be available.
-   *  By default only function call counts are kept.
+   * This configures the malloc family statistics to be available.
+   * By default only function call counts are kept.
    */
   rtems_malloc_statistics_functions_t *rtems_malloc_statistics_helpers =
@@ -886,8 +886,8 @@
 #ifdef CONFIGURE_INIT
   /**
-   *  This configures the sbrk() support for the malloc family.
-   *  By default it is assumed that the BSP provides all available
-   *  RAM to the malloc family implementation so sbrk()'ing to get
-   *  more memory would always fail anyway.
+   * This configures the sbrk() support for the malloc family.
+   * By default it is assumed that the BSP provides all available
+   * RAM to the malloc family implementation so sbrk()'ing to get
+   * more memory would always fail anyway.
    */
   const rtems_heap_extend_handler rtems_malloc_extend_handler =
@@ -901,7 +901,7 @@
 #ifdef CONFIGURE_INIT
   /**
-   *  This configures the malloc family plugin which dirties memory
-   *  allocated.  This is helpful for finding unitialized data structure
-   *  problems.
+   * This configures the malloc family plugin which dirties memory
+   * allocated.  This is helpful for finding unitialized data structure
+   * problems.
    */
   rtems_malloc_dirtier_t rtems_malloc_dirty_helper =
@@ -914,8 +914,8 @@
 
 /**
- *  This is a helper macro used in calculations in this file.  It is used
- *  to noted when an element is allocated from the RTEMS Workspace and adds
- *  a factor to account for heap overhead plus an alignment factor that
- *  may be applied.
+ * This is a helper macro used in calculations in this file.  It is used
+ * to noted when an element is allocated from the RTEMS Workspace and adds
+ * a factor to account for heap overhead plus an alignment factor that
+ * may be applied.
  */
 #define _Configure_From_workspace(_size) \
@@ -923,7 +923,7 @@
 
 /**
- *  This is a helper macro used in stack space calculations in this file.  It
- *  may be provided by the application in case a special task stack allocator
- *  is used.  The default is allocation from the RTEMS Workspace.
+ * This is a helper macro used in stack space calculations in this file.  It
+ * may be provided by the application in case a special task stack allocator
+ * is used.  The default is allocation from the RTEMS Workspace.
  */
 #ifdef CONFIGURE_TASK_STACK_FROM_ALLOCATOR
@@ -936,6 +936,6 @@
 
 /**
- *  Do not use the unlimited bit as part of the multiplication
- *  for memory usage.
+ * Do not use the unlimited bit as part of the multiplication
+ * for memory usage.
  */
 #define _Configure_Max_Objects(_max) \
@@ -943,9 +943,9 @@
 
 /**
- *  This macro accounts for how memory for a set of configured objects is
- *  allocated from the Executive Workspace.
- *
- *  NOTE: It does NOT attempt to address the more complex case of unlimited
- *        objects.
+ * This macro accounts for how memory for a set of configured objects is
+ * allocated from the Executive Workspace.
+ *
+ * NOTE: It does NOT attempt to address the more complex case of unlimited
+ *       objects.
  */
 #define _Configure_Object_RAM(_number, _size) \
@@ -1157,7 +1157,7 @@
 
 /**
- *  This specifies the maximum number of device drivers that
- *  can be installed in the system at one time.  It must account
- *  for both the statically and dynamically installed drivers.
+ * This specifies the maximum number of device drivers that
+ * can be installed in the system at one time.  It must account
+ * for both the statically and dynamically installed drivers.
  */
 #ifndef CONFIGURE_MAXIMUM_DRIVERS
@@ -1486,8 +1486,8 @@
 
   /**
-   *  This macro calculates the memory required for task variables.
+   * This macro calculates the memory required for task variables.
    *
-   *  @note Each task variable is individually allocated from the Workspace.
-   *        Hence, we do the multiplication on the configured size.
+   * NOTE: Each task variable is individually allocated from the Workspace.
+   *       Hence, we do the multiplication on the configured size.
    */
   #ifndef CONFIGURE_MAXIMUM_TASK_VARIABLES
@@ -1663,6 +1663,6 @@
 
   /**
-   *  Account for the object control structures plus the name
-   *  of the object to be duplicated.
+   * Account for the object control structures plus the name
+   * of the object to be duplicated.
    */
   #define _Configure_POSIX_Named_Object_RAM(_number, _size) \
@@ -1857,13 +1857,13 @@
 
   /**
-   *  The GNAT run-time needs something less than (10) POSIX mutexes.
-   *  We may be able to get by with less but why bother.
+   * The GNAT run-time needs something less than (10) POSIX mutexes.
+   * We may be able to get by with less but why bother.
    */
   #define CONFIGURE_GNAT_MUTEXES 10
 
   /**
-   *  This is the maximum number of Ada tasks which can be concurrently
-   *  in existence.  Twenty (20) are required to run all tests in the
-   *  ACATS (formerly ACVC).
+   * This is the maximum number of Ada tasks which can be concurrently
+   * in existence.  Twenty (20) are required to run all tests in the
+   * ACATS (formerly ACVC).
    */
   #ifndef CONFIGURE_MAXIMUM_ADA_TASKS
@@ -1920,6 +1920,6 @@
 #ifndef RTEMS_SCHEDSIM
 /**
- *  This macro specifies the amount of memory to be reserved for the
- *  Newlib C Library reentrancy structure -- if we are using newlib.
+ * This macro specifies the amount of memory to be reserved for the
+ * Newlib C Library reentrancy structure -- if we are using newlib.
  */
 
@@ -1938,6 +1938,6 @@
 
 /**
- *  This is so we can account for tasks with stacks greater than minimum
- *  size.  This is in bytes.
+ * This is so we can account for tasks with stacks greater than minimum
+ * size.  This is in bytes.
  */
 #ifndef CONFIGURE_EXTRA_TASK_STACKS
@@ -1952,8 +1952,8 @@
 
 /**
- *  Account for allocating the following per object
- *    + array of object control structures
- *    + local pointer table -- pointer per object plus a zero'th
- *      entry in the local pointer table.
+ * Account for allocating the following per object
+ *   + array of object control structures
+ *   + local pointer table -- pointer per object plus a zero'th
+ *     entry in the local pointer table.
  */
 
@@ -1977,6 +1977,6 @@
 
 /**
- *  This defines the amount of memory configured for the multiprocessing
- *  support required by this application.
+ * This defines the amount of memory configured for the multiprocessing
+ * support required by this application.
  */
 #ifdef CONFIGURE_MP_APPLICATION
@@ -1992,7 +1992,7 @@
 
 /**
- *  The following macro is used to calculate the memory allocated by RTEMS
- *  for the message buffers associated with a particular message queue.
- *  There is a fixed amount of overhead per message.
+ * The following macro is used to calculate the memory allocated by RTEMS
+ * for the message buffers associated with a particular message queue.
+ * There is a fixed amount of overhead per message.
  */
 #define CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE(_messages, _size) \
@@ -2001,7 +2001,7 @@
 
 /**
- *  This macros is set to the amount of memory required for pending message
- *  buffers in bytes.  It should be constructed by adding together a
- *  set of values determined by CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE.
+ * This macros is set to the amount of memory required for pending message
+ * buffers in bytes.  It should be constructed by adding together a
+ * set of values determined by CONFIGURE_MESSAGE_BUFFERS_FOR_QUEUE.
  */
 #ifndef CONFIGURE_MESSAGE_BUFFER_MEMORY
@@ -2010,14 +2010,14 @@
 
 /**
- *  This macro is available just in case the confdefs.h file underallocates
- *  memory for a particular application.  This lets the user add some extra
- *  memory in case something broken and underestimates.
- *
- *  It is also possible for cases where confdefs.h overallocates memory,
- *  you could substract memory from the allocated.  The estimate is just
- *  that, an estimate, and assumes worst case alignment and padding on
- *  each allocated element.  So in some cases it could be too conservative.
- *
- *  @note Historically this was used for message buffers.
+ * This macro is available just in case the confdefs.h file underallocates
+ * memory for a particular application.  This lets the user add some extra
+ * memory in case something broken and underestimates.
+ *
+ * It is also possible for cases where confdefs.h overallocates memory,
+ * you could substract memory from the allocated.  The estimate is just
+ * that, an estimate, and assumes worst case alignment and padding on
+ * each allocated element.  So in some cases it could be too conservative.
+ *
+ * NOTE: Historically this was used for message buffers.
  */
 #ifndef CONFIGURE_MEMORY_OVERHEAD
@@ -2026,8 +2026,8 @@
 
 /**
- *  On architectures that use Simple Vectored Interrupts, it is RTEMS
- *  responsibility to allocate the vector table.  This avoids reserving
- *  the memory on architectures that use the Programmable Interrupt
- *  Controller Vectored Interrupts.
+ * On architectures that use Simple Vectored Interrupts, it is RTEMS
+ * responsibility to allocate the vector table.  This avoids reserving
+ * the memory on architectures that use the Programmable Interrupt
+ * Controller Vectored Interrupts.
  */
 #if (CPU_SIMPLE_VECTORED_INTERRUPTS == TRUE)
@@ -2051,6 +2051,6 @@
 
 /**
- *  RTEMS uses one instance of an internal mutex class.  This accounts
- *  for that mutex
+ * RTEMS uses one instance of an internal mutex class.  This accounts
+ * for that mutex
  */
 #define CONFIGURE_API_MUTEX_MEMORY \
@@ -2058,6 +2058,6 @@
 
 /**
- *  This calculates the amount of memory reserved for the IDLE tasks.
- *  In an SMP system, each CPU core has its own idle task.
+ * This calculates the amount of memory reserved for the IDLE tasks.
+ * In an SMP system, each CPU core has its own idle task.
  */
 #if defined(RTEMS_SMP)
@@ -2068,6 +2068,6 @@
 
 /**
- *  This defines the formula used to compute the amount of memory
- *  reserved for IDLE task control structures.
+ * This defines the formula used to compute the amount of memory
+ * reserved for IDLE task control structures.
  */
 #define CONFIGURE_MEMORY_FOR_IDLE_TASK \
@@ -2075,5 +2075,5 @@
 
 /**
- *  This macro accounts for general RTEMS system overhead.
+ * This macro accounts for general RTEMS system overhead.
  */
 #define CONFIGURE_MEMORY_FOR_SYSTEM_OVERHEAD \
@@ -2086,6 +2086,6 @@
 
 /**
- *  This macro provides a summation of the various task and thread
- *  requirements.
+ * This macro provides a summation of the various task and thread
+ * requirements.
  */
 #define CONFIGURE_TOTAL_TASKS_AND_THREADS \
@@ -2095,6 +2095,6 @@
 
 /**
- *  This macro reserves the memory required by the statically configured
- *  user extensions.
+ * This macro reserves the memory required by the statically configured
+ * user extensions.
  */
 #define CONFIGURE_MEMORY_FOR_STATIC_EXTENSIONS \
@@ -2106,6 +2106,6 @@
 
 /**
- *  This macro provides a summation of the memory required by the
- *  Classic API as configured.
+ * This macro provides a summation of the memory required by the
+ * Classic API as configured.
  */
 #define CONFIGURE_MEMORY_FOR_CLASSIC \
@@ -2134,5 +2134,5 @@
 
 /**
- *  This calculates the memory required for the executive workspace.
+ * This calculates the memory required for the executive workspace.
  */
 #define CONFIGURE_EXECUTIVE_RAM_SIZE \
@@ -2156,6 +2156,6 @@
 
 /**
- *  This accounts for any extra memory required by the Classic API
- *  Initialization Task.
+ * This accounts for any extra memory required by the Classic API
+ * Initialization Task.
  */
 #if (CONFIGURE_INIT_TASK_STACK_SIZE > CONFIGURE_MINIMUM_TASK_STACK_SIZE)
@@ -2167,6 +2167,6 @@
 
 /**
- *  This accounts for any extra memory required by the POSIX API
- *  Initialization Thread.
+ * This accounts for any extra memory required by the POSIX API
+ * Initialization Thread.
  */
 #if defined(RTEMS_POSIX_API) && \
@@ -2181,6 +2181,6 @@
 
 /**
- *  This macro provides a summation of the various initialization task
- *  and thread stack requirements.
+ * This macro provides a summation of the various initialization task
+ * and thread stack requirements.
  */
 #define CONFIGURE_INITIALIZATION_THREADS_EXTRA_STACKS \
@@ -2242,5 +2242,5 @@
 #ifdef CONFIGURE_INIT
   /**
-   *  This is the Classic API Configuration Table.
+   * This is the Classic API Configuration Table.
    */
   rtems_api_configuration_table Configuration_RTEMS_API = {
@@ -2261,5 +2261,5 @@
   #ifdef RTEMS_POSIX_API
     /**
-     *  This is the POSIX API Configuration Table.
+     * This is the POSIX API Configuration Table.
      */
     posix_api_configuration_table Configuration_POSIX_API = {
@@ -2286,27 +2286,29 @@
   #endif
 
-  /** This variable specifies the minimum stack size for tasks in an RTEMS
-   *  application.
+  /** 
+   * This variable specifies the minimum stack size for tasks in an RTEMS
+   * application.
    *
-   *  @note This is left as a simple uint32_t so it can be externed as
-   *        needed without requring being high enough logical to
-   *        include the full configuration table.
+   * NOTE: This is left as a simple uint32_t so it can be externed as
+   *       needed without requring being high enough logical to
+   *       include the full configuration table.
    */
   uint32_t rtems_minimum_stack_size =
     CONFIGURE_MINIMUM_TASK_STACK_SIZE;
 
-  /** This variable specifies the maximum priority value that
-   *  a task may have.  This must be a power of 2 between 4
-   *  and 256 and is specified in terms of Classic API
-   *  priority values.
+  /** 
+   * This variable specifies the maximum priority value that
+   * a task may have.  This must be a power of 2 between 4
+   * and 256 and is specified in terms of Classic API
+   * priority values.
    *
-   *  @note This is left as a simple uint8_t so it can be externed as
-   *        needed without requring being high enough logical to
-   *        include the full configuration table.
+   * NOTE: This is left as a simple uint8_t so it can be externed as
+   *       needed without requring being high enough logical to
+   *       include the full configuration table.
    */
   uint8_t rtems_maximum_priority = CONFIGURE_MAXIMUM_PRIORITY;
 
   /**
-   *  This is the primary Configuration Table for this application.
+   * This is the primary Configuration Table for this application.
    */
   const rtems_configuration_table Configuration = {
@@ -2351,6 +2353,6 @@
 #if defined(RTEMS_SMP)
   /**
-   *  Instantiate the variable which specifies the number of CPUs
-   *  in an SMP configuration.
+   * Instantiate the variable which specifies the number of CPUs
+   * in an SMP configuration.
    */
   #if defined(CONFIGURE_INIT)
@@ -2415,9 +2417,9 @@
 #if defined(CONFIGURE_CONFDEFS_DEBUG) && defined(CONFIGURE_INIT)
   /**
-   *  This is a debug mechanism, so if you need to, the executable will
-   *  have a structure with various partial values.  Add to this as you
-   *  need to.  Viewing this structure in gdb combined with dumping
-   *  the Configuration structures generated should help a lot in tracing
-   *  down errors and analyzing where over and under allocations are.
+   * This is a debug mechanism, so if you need to, the executable will
+   * have a structure with various partial values.  Add to this as you
+   * need to.  Viewing this structure in gdb combined with dumping
+   * the Configuration structures generated should help a lot in tracing
+   * down errors and analyzing where over and under allocations are.
    */
   typedef struct {
Index: cpukit/sapi/include/rtems/cbs.h
===================================================================
--- cpukit/sapi/include/rtems/cbs.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/cbs.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,4 +1,4 @@
 /**
- * @file rtems/cbs.h
+ * @file
  *
  * @brief Constants and Structures Associated
Index: cpukit/sapi/include/rtems/chain.h
===================================================================
--- cpukit/sapi/include/rtems/chain.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/chain.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,8 +1,6 @@
 /**
  * @file
- *
- * @ingroup ClassicChains
- *
- * @brief Chain API.
+ * 
+ * @brief Chain API
  */
 
@@ -34,5 +32,5 @@
  * @ingroup ClassicRTEMS
  *
- * @brief Chain API.
+ * @brief Chain API
  *
  * @{
Index: cpukit/sapi/include/rtems/config.h
===================================================================
--- cpukit/sapi/include/rtems/config.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/config.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,4 +1,4 @@
 /**
- * @file rtems/config.h
+ * @file
  *
  * @brief Table of User Defined Configuration Parameters
@@ -80,7 +80,8 @@
   uint32_t            maximum_proxies;
 
-  /** The MPCI Receive server is assumed to have a stack of at least
-   *  minimum stack size.  This field specifies the amount of extra
-   *  stack this task will be given in bytes.
+  /** 
+   * The MPCI Receive server is assumed to have a stack of at least
+   * minimum stack size.  This field specifies the amount of extra
+   * stack this task will be given in bytes.
    */
   uint32_t            extra_mpci_receive_server_stack;
@@ -94,5 +95,5 @@
  * @brief Task stack allocator initialization hook.
  *
- * @param[in] stack_space_size Size of the stack space in bytes.
+ * @param[in] stack_space_size is the size of the stack space in bytes.
  */
 typedef void (*rtems_stack_allocate_init_hook)( size_t stack_space_size );
@@ -101,5 +102,5 @@
  * @brief Task stack allocator hook.
  *
- * @param[in] stack_size Size of the task stack in bytes.
+ * @param[in] stack_size is the Size of the task stack in bytes.
  *
  * @retval NULL Not enough memory.
@@ -111,5 +112,5 @@
  * @brief Task stack deallocator hook.
  *
- * @param[in] addr Pointer to previously allocated task stack.
+ * @param[in] addr is a pointer to previously allocated task stack.
  */
 typedef void (*rtems_stack_free_hook)( void *addr );
@@ -127,47 +128,56 @@
  */
 typedef struct {
-  /** This field specifies the size in bytes of the RTEMS Workspace.
+  /**
+   * This field specifies the size in bytes of the RTEMS Workspace.
    */
   uintptr_t                      work_space_size;
 
-  /** This field specifies the size in bytes of the RTEMS thread stack space.
+  /**
+   * This field specifies the size in bytes of the RTEMS thread stack space.
    */
   uintptr_t                      stack_space_size;
 
-  /** This field specifies the maximum number of dynamically installed
-   *  used extensions.
+  /** 
+   * This field specifies the maximum number of dynamically installed
+   * used extensions.
    */
   uint32_t                       maximum_extensions;
 
-  /** This field specifies the number of microseconds which elapse
-   *  between clock ticks.  This is the basis for RTEMS timing.
+  /** 
+   * This field specifies the number of microseconds which elapse
+   * between clock ticks.  This is the basis for RTEMS timing.
    */
   uint32_t                       microseconds_per_tick;
 
-  /** This field specifies the number of nanoseconds which elapse
-   *  between clock ticks.  This value is derived from the
-   *  microseconds_per_tick field and provided to avoid calculation at
-   *  run-time.
+  /** 
+   * This field specifies the number of nanoseconds which elapse
+   * between clock ticks.  This value is derived from the
+   * microseconds_per_tick field and provided to avoid calculation at
+   * run-time.
    */
   uint32_t                       nanoseconds_per_tick;
 
-  /** This field specifies the number of ticks in each task's timeslice.
+  /** 
+   * This field specifies the number of ticks in each task's timeslice.
    */
   uint32_t                       ticks_per_timeslice;
 
-  /** This element points to the BSP's optional idle task which may override
-   *  the default one provided with RTEMS.
+  /** 
+   * This element points to the BSP's optional idle task which may override
+   * the default one provided with RTEMS.
    */
   Thread                       (*idle_task)( uintptr_t );
 
-  /** This field specifies the size of the IDLE task's stack.  If less than or
-   *  equal to the minimum stack size, then the IDLE task will have the minimum
-   *  stack size.
+  /** 
+   * This field specifies the size of the IDLE task's stack.  If less than or
+   * equal to the minimum stack size, then the IDLE task will have the minimum
+   * stack size.
    */
   uint32_t                       idle_task_stack_size;
 
-  /** This field specifies the size of the interrupt stack.  If less than or
-   *  equal to the minimum stack size, then the interrupt stack will be of
-   *  minimum stack size.
+  /** 
+   * This field specifies the size of the interrupt stack.  If less than or
+   * equal to the minimum stack size, then the interrupt stack will be of
+   * minimum stack size.
    */
   uint32_t                       interrupt_stack_size;
@@ -188,8 +198,9 @@
   rtems_stack_free_hook          stack_free_hook;
 
-  /** If this element is TRUE, then RTEMS will zero the Executive Workspace.
-   *  When this element is FALSE, it is assumed that the BSP or invoking
-   *  environment has ensured that memory was cleared before RTEMS was
-   *  invoked.
+  /** 
+   * If this element is TRUE, then RTEMS will zero the Executive Workspace.
+   * When this element is FALSE, it is assumed that the BSP or invoking
+   * environment has ensured that memory was cleared before RTEMS was
+   * invoked.
    */
   bool                           do_zero_of_workspace;
@@ -223,5 +234,5 @@
 
 /**
- *   This is the configuration table generated by confdefs.h.
+ * This is the configuration table generated by confdefs.h.
  */
 extern const rtems_configuration_table Configuration;
@@ -229,5 +240,5 @@
 #if defined(RTEMS_MULTIPROCESSING)
   /**
-   *   This points to the multiprocessing configuration table.
+   *  This points to the multiprocessing configuration table.
    */
   SAPI_EXTERN rtems_multiprocessing_table  *_Configuration_MP_table;
@@ -236,8 +247,8 @@
 #if defined(RTEMS_MULTIPROCESSING)
   /**
-   *  @brief RTEMS Multiprocessing Configuration Table
+   * @brief RTEMS multiprocessing configuration table.
    *
-   *  This is the RTEMS Multiprocessing Configuration Table expected to
-   *  be generated by confdefs.h.
+   * This is the RTEMS Multiprocessing Configuration Table expected to
+   * be generated by confdefs.h.
    */
   extern rtems_multiprocessing_table  Multiprocessing_configuration;
@@ -295,5 +306,5 @@
         (Configuration.stack_free_hook)
 
-/**
+ /**
   * This macro assists in accessing the field which indicates whether
   * RTEMS is responsible for zeroing the Executive Workspace.
Index: cpukit/sapi/include/rtems/extension.h
===================================================================
--- cpukit/sapi/include/rtems/extension.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/extension.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,7 +1,5 @@
 /**
  * @file
- *
- * @ingroup ClassicUserExtensions
- *
+ * 
  * @brief User Extensions API.
  */
@@ -40,5 +38,5 @@
 
 /**
- *  @brief Initialize Extension Manager
+ *  @brief Initialize extension manager.
  *
  *  This routine initializes all extension manager related data structures.
Index: cpukit/sapi/include/rtems/fatal.h
===================================================================
--- cpukit/sapi/include/rtems/fatal.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/fatal.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,6 +1,4 @@
 /**
  * @file
- *
- * @ingroup ClassicFatal
  *
  * @brief Fatal API.
@@ -43,7 +41,7 @@
 
 /**
- *  @brief Prints the exception frame via printk().
+ * @brief Prints the exception frame via printk().
  *
- *  @see rtems_fatal() and RTEMS_FATAL_SOURCE_EXCEPTION.
+ * @see rtems_fatal() and RTEMS_FATAL_SOURCE_EXCEPTION.
  */
 static inline void rtems_exception_frame_print(
@@ -58,7 +56,5 @@
  * INTERNAL_ERROR_RTEMS_API and is internal set to false.
  *
- * @param[in] the_error A 32-bit fatal error code.
- *
- * @return This function will not return.
+ * @param[in] the_error is a 32-bit fatal error code.
  *
  * @see _Internal_error_Occurred().
@@ -71,8 +67,6 @@
  * @brief Invokes the internal error handler with is internal set to false.
  *
- * @param[in] source The fatal source.
- * @param[in] error The fatal code.
- *
- * @return This function will not return.
+ * @param[in] source is the fatal source.
+ * @param[in] error is the fatal code.
  *
  * @see _Internal_error_Occurred().
@@ -86,8 +80,8 @@
  * @brief Returns a description for a fatal source.
  *
- * @param[in] source The fatal source.
+ * @param[in] source is the fatal source.
  *
- * @return The fatal source description or "?" in case the passed fatal source
- * is invalid.
+ * @retval description The fatal source description.
+ * @retval ? The passed fatal source is invalid.
  */
 const char *rtems_fatal_source_description( rtems_fatal_source source );
@@ -96,8 +90,8 @@
  * @brief Returns a description for an internal error code.
  *
- * @param[in] error The error code.
+ * @param[in] error is the error code.
  *
- * @return The error code description or "?" in case the passed error code is
- * invalid.
+ * @retval description The error code description.
+ * @retval ? The passed error code is invalid.
  */
 const char *rtems_internal_error_description( rtems_fatal_code error );
Index: cpukit/sapi/include/rtems/init.h
===================================================================
--- cpukit/sapi/include/rtems/init.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/init.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,18 +1,18 @@
 /**
- * @file rtems/init.h
+ * @file
  *
  * @brief Constants and Structures Associated
  * with the Initialization Manager
  *
- *  This include file contains all the constants and structures associated
- *  with the Initialization Manager.  This manager is responsible for
- *  initializing RTEMS, creating and starting all configured initialization
- *  tasks, invoking the initialization routine for each user-supplied device
- *  driver, and initializing the optional multiprocessor layer.
+ * This include file contains all the constants and structures associated
+ * with the Initialization Manager.  This manager is responsible for
+ * initializing RTEMS, creating and starting all configured initialization
+ * tasks, invoking the initialization routine for each user-supplied device
+ * driver, and initializing the optional multiprocessor layer.
  *
- *  This manager provides directives to:
+ * This manager provides directives to:
  *
- *     + initialize the RTEMS executive
- *     + shutdown the RTEMS executive
+ *    + initialize the RTEMS executive
+ *    + shutdown the RTEMS executive
  */
 
@@ -39,6 +39,6 @@
 #if defined(RTEMS_MULTIPROCESSING)
 /**
- *  The following defines the default Multiprocessing Configuration
- *  Table.  This table is used in a single processor system.
+ * The following defines the default Multiprocessing Configuration
+ * Table.  This table is used in a single processor system.
  */
 extern const rtems_multiprocessing_table
@@ -47,42 +47,42 @@
 
 /**
- *  @brief rtems_initialize_data_structures
+ * @brief RTEMS data structures initialization.
  *
- *  This routine implements the portion of the RTEMS initializatin process
- *  that involves initializing data structures to a state that scheduling
- *  can occur in a consistent manner.
+ * This routine implements the portion of the RTEMS initializatin process
+ * that involves initializing data structures to a state that scheduling
+ * can occur in a consistent manner.
  */
 void rtems_initialize_data_structures(void);
 
 /**
- *  @brief rtems_initialize_before_drivers
+ * @brief RTEMS initialization before the device drivers are initialized.
  *
- *  This routine implements the portion of RTEMS initialization that
- *  is done immediately before device drivers are initialized.
+ * This routine implements the portion of RTEMS initialization that
+ * is done immediately before device drivers are initialized.
  */
 void rtems_initialize_before_drivers(void);
 
 /**
- *  @brief rtems_initialize_device_drivers
+ * @brief RTEMS initialization that initializes all device drivers.
  *
- *  This routine implements the portion of RTEMS initialization that
- *  initializes all device drivers.
+ * This routine implements the portion of RTEMS initialization that
+ * initializes all device drivers.
  */
 void rtems_initialize_device_drivers(void);
 
 /**
- *  @brief Starts the multitasking.
+ * @brief Starts the multitasking.
  *
- *  This directive initiates multitasking and performs a context switch to the
- *  first user application task and may enable interrupts as a side-effect of
- *  that context switch.  The context switch saves the executing context.  The
- *  application runs now.  The directive rtems_shutdown_executive() will return
- *  to the saved context.  The exit() function will use this directive.
+ * This directive initiates multitasking and performs a context switch to the
+ * first user application task and may enable interrupts as a side-effect of
+ * that context switch.  The context switch saves the executing context.  The
+ * application runs now.  The directive rtems_shutdown_executive() will return
+ * to the saved context.  The exit() function will use this directive.
  *
- *  After a return to the saved context a fatal system state is reached.  The
- *  fatal source is RTEMS_FATAL_SOURCE_EXIT with a fatal code set to the value
- *  passed to rtems_shutdown_executive().
+ * After a return to the saved context a fatal system state is reached.  The
+ * fatal source is RTEMS_FATAL_SOURCE_EXIT with a fatal code set to the value
+ * passed to rtems_shutdown_executive().
  *
- *  This directive does not return.
+ * This directive does not return.
  */
 void rtems_initialize_start_multitasking(void)
@@ -90,11 +90,11 @@
 
 /**
- *  @brief Shutdown the RTEMS environment
+ * @brief Shutdown the RTEMS environment.
  *
- *  This routine implements the rtems_shutdown_executive directive.  The
- *  invocation of this directive results in the RTEMS environment being
- *  shutdown and multitasking halted.  From the application's perspective,
- *  invocation of this directive results in the rtems_initialize_executive
- *  directive exitting to the startup code which invoked it.
+ * This routine implements the rtems_shutdown_executive directive.  The
+ * invocation of this directive results in the RTEMS environment being
+ * shutdown and multitasking halted.  From the application's perspective,
+ * invocation of this directive results in the rtems_initialize_executive
+ * directive exitting to the startup code which invoked it.
  */
 void rtems_shutdown_executive(
Index: cpukit/sapi/include/rtems/io.h
===================================================================
--- cpukit/sapi/include/rtems/io.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/io.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -102,11 +102,11 @@
 
 /**
- *  @brief Unregister a Driver from the Device Driver Table.
- *
- *  @param[in] major is the device major number.
- *
- *  @retval RTEMS_SUCCESSFUL Device driver successfully unregistered.
- *  @retval RTEMS_UNSATISFIED Invalid major number.
- *  @retval RTEMS_CALLED_FROM_ISR Called from interrupt context.
+ * @brief Unregister a driver from the device driver table.
+ *
+ * @param[in] major is the device major number.
+ *
+ * @retval RTEMS_SUCCESSFUL Device driver successfully unregistered.
+ * @retval RTEMS_UNSATISFIED Invalid major number.
+ * @retval RTEMS_CALLED_FROM_ISR Called from interrupt context.
  */
 rtems_status_code rtems_io_unregister_driver(
@@ -132,13 +132,13 @@
 
 /**
- *  @brief IO Driver Initialization
- *
- *  This routine is the initialization directive of the IO manager.
- *
- *  @param[in] major is the device drive number
- *  @param[in] minor is the device number
- *  @param[in] argument is the pointer to the argument(s)
- *
- *  @return status code
+ * @brief IO driver initialization.
+ *
+ * This routine is the initialization directive of the IO manager.
+ *
+ * @param[in] major is the device drive number
+ * @param[in] minor is the device number
+ * @param[in] argument is the pointer to the argument(s)
+ *
+ * @return status code
  */
 rtems_status_code rtems_io_initialize(
@@ -149,13 +149,13 @@
 
 /**
- *  @brief Opening for The IO Manager
- *  
- *  Opens a device driver with the number @a major.
- *
- *  @param[in] major is the device driver number.
- *  @param[in] minor is the device number.
- *  @param[in] argument is the pointer to the argument(s).
- *
- *  @return Status code.
+ * @brief Opening for the IO manager.
+ *  
+ * Opens a device driver with the number @a major.
+ *
+ * @param[in] major is the device driver number.
+ * @param[in] minor is the device number.
+ * @param[in] argument is the pointer to the argument(s).
+ *
+ * @return Status code.
  */
 rtems_status_code rtems_io_open(
@@ -166,13 +166,13 @@
 
 /**
- *  @brief Closing for The IO Manager
- *  
- *  This routine is the close directive of the IO manager.
- *
- *  @param[in] major is the device driver number.
- *  @param[in] minor is the device number.
- *  @param[in] argument is the pointer to the argument(s).
- *
- *  @return Status code.
+ * @brief Closing for the IO manager.
+ *  
+ * This routine is the close directive of the IO manager.
+ *
+ * @param[in] major is the device driver number.
+ * @param[in] minor is the device number.
+ * @param[in] argument is the pointer to the argument(s).
+ *
+ * @return Status code.
  */
 rtems_status_code rtems_io_close(
@@ -183,13 +183,13 @@
 
 /**
- *  @brief Reading for The IO Manager
- *  
- *  This routine is the read directive of the IO manager.
- *
- *  @param[in] major is the device driver number.
- *  @param[in] minor is the device number.
- *  @param[in] argument is the pointer to the argument(s).
- *
- *  @return Status code.
+ * @brief Reading for the IO manager.
+ *  
+ * This routine is the read directive of the IO manager.
+ *
+ * @param[in] major is the device driver number.
+ * @param[in] minor is the device number.
+ * @param[in] argument is the pointer to the argument(s).
+ *
+ * @return Status code.
  */
 rtems_status_code rtems_io_read(
@@ -200,13 +200,13 @@
 
 /**
- *  @brief Writing for The IO Manager
- *  
- *  This routine is the write directive of the IO manager.
- *
- *  @param[in] major is the device driver number.
- *  @param[in] minor is the device number.
- *  @param[in] argument is the pointer to the argument(s).
- *
- *  @return Status code.
+ * @brief Writing for the IO manager.
+ *  
+ * This routine is the write directive of the IO manager.
+ *
+ * @param[in] major is the device driver number.
+ * @param[in] minor is the device number.
+ * @param[in] argument is the pointer to the argument(s).
+ *
+ * @return Status code.
  */
 rtems_status_code rtems_io_write(
@@ -217,13 +217,13 @@
 
 /**
- *  @brief Control for The IO Manager
- *  
- *  This routine is the control directive of the IO manager.
- *
- *  @param[in] major is the device driver number.
- *  @param[in] minor is the device number.
- *  @param[in] argument is the pointer to the argument(s).
- *
- *  @return Status code.
+ * @brief Control for the IO manager.
+ *  
+ * This routine is the control directive of the IO manager.
+ *
+ * @param[in] major is the device driver number.
+ * @param[in] minor is the device number.
+ * @param[in] argument is the pointer to the argument(s).
+ *
+ * @return Status code.
  */
 rtems_status_code rtems_io_control(
@@ -257,16 +257,16 @@
 
 /**
- *  @brief Initialization of Device Drivers
- *
- *  @note The IO manager has been extended to support runtime driver
- *  registration. The driver table is now allocated in the
- *  workspace.
+ * @brief Initialization of device drivers.
+ *
+ * NOTE: The IO manager has been extended to support runtime driver
+ * registration. The driver table is now allocated in the
+ * workspace.
  */
 void _IO_Manager_initialization( void );
 
 /**
- *  @brief Initialization of All Device Drivers
- *
- *  Initializes all device drivers.
+ * @brief Initialization of all device drivers.
+ *
+ * Initializes all device drivers.
  */
 void _IO_Initialize_all_drivers( void );
Index: cpukit/sapi/include/rtems/mptables.h
===================================================================
--- cpukit/sapi/include/rtems/mptables.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/mptables.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,4 +1,4 @@
 /**
- * @file rtems/mptables.h
+ * @file
  *
  * @brief Executive's Pre-Initialized Tables used in a
Index: cpukit/sapi/include/rtems/rbheap.h
===================================================================
--- cpukit/sapi/include/rtems/rbheap.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/rbheap.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -3,6 +3,4 @@
  *
  * @brief Red-Black Tree Heap API
- *
- * @ingroup RBHeap
  */
 
@@ -35,5 +33,5 @@
  * @defgroup RBHeap Red-Black Tree Heap
  *
- * @brief Red-Black Tree Heap API.
+ * @brief Red-Black Tree Heap API
  *
  * The red-black tree heap provides a memory allocator suitable to implement
@@ -147,11 +145,11 @@
  * @brief Initializes the red-black tree heap @a control.
  *
- * @param[in, out] control The red-black tree heap.
- * @param[in] area_begin The managed memory area begin.
- * @param[in] area_size The managed memory area size.
- * @param[in] alignment The minimum chunk alignment.
- * @param[in] extend_descriptors The handler to extend the available chunk
+ * @param[in, out] control is the red-black tree heap.
+ * @param[in] area_begin is the managed memory area begin.
+ * @param[in] area_size is the managed memory area size.
+ * @param[in] alignment is the minimum chunk alignment.
+ * @param[in] extend_descriptors is the handler to extend the available chunk
  * descriptors.
- * @param[in] handler_arg The handler argument.
+ * @param[in] handler_arg is the handler argument.
  *
  * @retval RTEMS_SUCCESSFUL Successful operation.
@@ -176,6 +174,6 @@
  * rtems_rbheap_initialize().
  *
- * @param[in, out] control The red-black tree heap.
- * @param[in] size The requested chunk size in bytes.
+ * @param[in, out] control is the red-black tree heap.
+ * @param[in] size is the requested chunk size in bytes.
  *
  * @retval NULL Not enough free space in the heap.
@@ -185,14 +183,15 @@
 
 /**
- * @brief Frees a chunk of memory @a ptr allocated from the red-black tree heap
- * @a control.
- *
- * @param[in, out] control The red-black tree heap.
- * @param[in] ptr The pointer to the chunk of memory.
+ * @brief Frees a chunk of memory @a ptr allocated from the red-black 
+ * tree heap @a control.
+ *
+ * @param[in, out] control is the red-black tree heap.
+ * @param[in] ptr is a pointer to the chunk of memory.
  *
  * @retval RTEMS_SUCCESSFUL Successful operation.
  * @retval RTEMS_INVALID_ID The chunk of memory is not a valid chunk in the
  * red-black tree heap.
- * @retval RTEMS_INCORRECT_STATE The chunk of memory is not in the right state.
+ * @retval RTEMS_INCORRECT_STATE The chunk of memory is not in the 
+ * right state.
  */
 rtems_status_code rtems_rbheap_free(rtems_rbheap_control *control, void *ptr);
Index: cpukit/sapi/include/rtems/rbtree.h
===================================================================
--- cpukit/sapi/include/rtems/rbtree.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/rbtree.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,10 +1,11 @@
 /**
- * @file rtems/rbtree.h
- *
- *  This include file contains all the constants and structures associated
- *  with the RBTree API in RTEMS. The rbtree is a Red Black Tree that
- *  is part of the Super Core. This is the published interface to that
- *  code.
- *
+ * @file
+ * 
+ * @brief Constants and Structures Associated with the RBTree API in RTEMS
+ * 
+ * This include file contains all the constants and structures associated
+ * with the RBTree API in RTEMS. The rbtree is a Red Black Tree that
+ * is part of the Super Core. This is the published interface to that
+ * code.
  */
 
@@ -51,5 +52,5 @@
 
 /**
- *  @brief RBTree initializer for an empty rbtree with designator @a name.
+ * @brief RBTree initializer for an empty rbtree with designator @a name.
  */
 #define RTEMS_RBTREE_INITIALIZER_EMPTY(name) \
@@ -57,5 +58,5 @@
 
 /**
- *  @brief RBTree definition for an empty rbtree with designator @a name.
+ * @brief RBTree definition for an empty rbtree with designator @a name.
  */
 #define RTEMS_RBTREE_DEFINE_EMPTY(name) \
Index: cpukit/sapi/include/rtems/sptables.h
===================================================================
--- cpukit/sapi/include/rtems/sptables.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/sptables.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,7 +1,9 @@
 /**
- * @file rtems/sptables.h
+ * @file
+ * 
+ * @brief Pre-Initialized Tables Used when in a Single Processor Configuration
  *
- *  This include file contains the executive's pre-initialized tables
- *  used when in a single processor configuration.
+ * This include file contains the executive's pre-initialized tables
+ * used when in a single processor configuration.
  */
 
Index: cpukit/sapi/include/rtems/timespec.h
===================================================================
--- cpukit/sapi/include/rtems/timespec.h	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/include/rtems/timespec.h	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -27,7 +27,8 @@
  *
  *  @brief Timespec API
+ * 
+ * @{
  *
  */
-/**@{*/
 
 #include <stdbool.h> /* bool */
@@ -41,10 +42,10 @@
 #include <rtems/timespec.inl>
 
+/** @} */
+
 #ifdef __cplusplus
 }
 #endif
 
-/**@}*/
-
 #endif
 /* end of include file */
Index: cpukit/sapi/inline/rtems/cbs.inl
===================================================================
--- cpukit/sapi/inline/rtems/cbs.inl	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/inline/rtems/cbs.inl	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,7 +1,9 @@
 /**
- * @file cbs.inl
- *
- *  This include file contains all the constants and structures associated
- *  with the CBS library.
+ * @file
+ * 
+ * @brief Constants and Structures Associated with the CBS Library
+ * 
+ * This include file contains all the constants and structures associated
+ * with the CBS library.
  *
  */
@@ -23,9 +25,9 @@
 
 /**
- *  @brief rtems cbs init
- *
- *  Initializes the CBS library.
- *
- *  @return status code.
+ * @brief Initialize the CBS library.
+ *
+ * Initializes the CBS library.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_initialize ( void )
@@ -35,9 +37,9 @@
 
 /**
- *  @brief rtems cbs cleanup
- *
- *  Cleanup resources associated to the CBS Library.
- *
- *  @return status code.
+ * @brief Cleanup resources associated to the CBS Library
+ *
+ * Cleanup resources associated to the CBS Library.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_cleanup ( void )
@@ -47,9 +49,9 @@
 
 /**
- *  @brief rtems cbs create server
- *
- *  Create a new server with specified parameters.
- *
- *  @return status code.
+ * @brief Create a new server with specified parameters.
+ *
+ * Create a new server with specified parameters.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_create_server (
@@ -67,9 +69,9 @@
 
 /**
- *  @brief rtems cbs attach thread
- *
- *  Attach a task to an already existing server.
- *
- *  @return status code.
+ * @brief Attach a task to an already existing server.
+ *
+ * Attach a task to an already existing server.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_attach_thread (
@@ -82,9 +84,9 @@
 
 /**
- *  @brief rtems cbs detach thread
- *
- *  Detach from the CBS Server.
- *
- *  @return status code.
+ * @brief Detach from the CBS server.
+ *
+ * Detach from the CBS Server.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_detach_thread (
@@ -97,9 +99,9 @@
 
 /**
- *  @brief rtems cbs destroy server
- *
- *  Detach all tasks from a server and destroy it.
- *
- *  @return status code.
+ * @brief Detach all tasks from a server and destroy it.
+ *
+ * Detach all tasks from a server and destroy it.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_destroy_server (
@@ -111,10 +113,10 @@
 
 /**
- *  @brief rtems cbs get server id
- *
- *  Get a thread server id, or RTEMS_CBS_E_NOT_FOUND if it is not
- *  attached to any server.
- *
- *  @return status code.
+ * @brief Get CBS server id.
+ *
+ * Get a thread server id, or RTEMS_CBS_E_NOT_FOUND if it is not
+ * attached to any server.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_get_server_id (
@@ -127,9 +129,9 @@
 
 /**
- *  @brief rtems cbs get parameters
- *
- *  Retrieve CBS scheduling parameters.
- *
- *  @return status code.
+ * @brief Get CBS parameters.
+ *
+ * Retrieve CBS scheduling parameters.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_get_parameters (
@@ -142,9 +144,9 @@
 
 /**
- *  @brief rtems cbs set parameters
- *
- *  Change CBS scheduling parameters.
- *
- *  @return status code.
+ * @brief Set CBS parameters.
+ *
+ * Change CBS scheduling parameters.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_set_parameters (
@@ -157,9 +159,9 @@
 
 /**
- *  @brief rtems cbs get execution time
- *
- *  Retrieve time info relative to the current server.
- *
- *  @return status code.
+ * @brief Get the CBS get execution time.
+ *
+ * Retrieve time info relative to the current server.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_get_execution_time (
@@ -173,9 +175,9 @@
 
 /**
- *  @brief rtems cbs get remaining budget
- *
- *  Retrieve remaining budget for the current server instance.
- *
- *  @return status code.
+ * @brief Get the remaining CBS budget.
+ *
+ * Retrieve remaining budget for the current server instance.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_get_remaining_budget (
@@ -188,10 +190,10 @@
 
 /**
- *  @brief rtems cbs get approved budget
- *
- *  Retrieve the budget that has been approved for the subsequent
- *  server instances.
- *
- *  @return status code.
+ * @brief Get the approved CBS budget.
+ *
+ * Retrieve the budget that has been approved for the subsequent
+ * server instances.
+ *
+ * @return status code.
  */
 RTEMS_INLINE_ROUTINE int rtems_cbs_get_approved_budget (
Index: cpukit/sapi/inline/rtems/chain.inl
===================================================================
--- cpukit/sapi/inline/rtems/chain.inl	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/inline/rtems/chain.inl	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -2,7 +2,5 @@
  * @file
  *
- * @ingroup ClassicChains
- *
- * @brief Chain API.
+ * @brief Chain API
  */
  
@@ -34,15 +32,15 @@
 
 /**
- *  @brief Initialize a Chain Header
- *
- *  This routine initializes @a the_chain structure to manage the
- *  contiguous array of @a number_nodes nodes which starts at
- *  @a starting_address.  Each node is of @a node_size bytes.
- *
- *  @param[in] the_chain specifies the chain to initialize
- *  @param[in] starting_address is the starting address of the array
- *         of elements
- *  @param[in] number_nodes is the number of nodes that will be in the chain
- *  @param[in] node_size is the size of each node
+ * @brief Initialize a chain Header.
+ *
+ * This routine initializes @a the_chain structure to manage the
+ * contiguous array of @a number_nodes nodes which starts at
+ * @a starting_address.  Each node is of @a node_size bytes.
+ *
+ * @param[in] the_chain specifies the chain to initialize
+ * @param[in] starting_address is the starting address of the array
+ *        of elements
+ * @param[in] number_nodes is the number of nodes that will be in the chain
+ * @param[in] node_size is the size of each node
  */
 RTEMS_INLINE_ROUTINE void rtems_chain_initialize(
@@ -57,9 +55,9 @@
 
 /**
- *  @brief Initialize this Chain as Empty
- *
- *  This routine initializes the specified chain to contain zero nodes.
- *
- *  @param[in] the_chain is the chain to be initialized.
+ * @brief Initialize this chain as empty.
+ *
+ * This routine initializes the specified chain to contain zero nodes.
+ *
+ * @param[in] the_chain is the chain to be initialized.
  */
 RTEMS_INLINE_ROUTINE void rtems_chain_initialize_empty(
@@ -71,10 +69,10 @@
 
 /**
- *  @brief Set off chain
- *
- *  This function sets the next and previous fields of the @a node to NULL
- *  indicating the @a node is not part of a chain.
- *
- *  @param[in] node the node set to off chain.
+ * @brief Set off chain.
+ *
+ * This function sets the next and previous fields of the @a node to NULL
+ * indicating the @a node is not part of a chain.
+ *
+ * @param[in] node the node set to off chain.
  */
 RTEMS_INLINE_ROUTINE void rtems_chain_set_off_chain(
@@ -86,12 +84,13 @@
 
 /**
- *  @brief Is the Node off Chain
- *
- *  This function returns true if the @a node is not on a chain. A @a node is
- *  off chain if the next and previous fields are set to NULL.
- *
- *  @param[in] node is the node off chain.
- *
- *  @return This function returns true if the @a node is off chain.
+ * @brief Is the node off chain.
+ *
+ * This function returns true if the @a node is not on a chain. A @a node is
+ * off chain if the next and previous fields are set to NULL.
+ *
+ * @param[in] node is the node off chain.
+ *
+ * @retval true The node is off chain.
+ * @retval false The node is not off chain.
  */
 RTEMS_INLINE_ROUTINE bool rtems_chain_is_node_off_chain(
@@ -103,11 +102,12 @@
 
 /**
- *  @brief Is the Chain Node Pointer NULL
- *
- *  This function returns true if the_node is NULL and false otherwise.
- *
- *  @param[in] the_node is the node pointer to check.
- *
- *  @return This method returns true if the_node is NULL and false otherwise.
+ * @brief Is the chain node pointer NULL.
+ *
+ * This function returns true if the_node is NULL and false otherwise.
+ *
+ * @param[in] the_node is the node pointer to check.
+ * 
+ * @retval true The chain node pointer is NULL.
+ * @retval false The chain node pointer is not NULL.
  */
 RTEMS_INLINE_ROUTINE bool rtems_chain_is_null_node(
@@ -119,11 +119,11 @@
 
 /**
- *  @brief Return pointer to Chain Head
- *
- *  This function returns a pointer to the first node on the chain.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *
- *  @return This method returns the permanent  node of the chain.
+ * @brief Return pointer to Chain Head
+ *
+ * This function returns a pointer to the first node on the chain.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ *
+ * @return This method returns the permanent node of the chain.
  */
 RTEMS_INLINE_ROUTINE rtems_chain_node *rtems_chain_head(
@@ -134,11 +134,12 @@
 }
 
-/** @brief Return pointer to immutable Chain Head
- *
- *  This function returns a pointer to the head node on the chain.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *
- *  @return This method returns the permanent head node of the chain.
+/**
+ * @brief Return pointer to immutable Chain Head
+ *
+ * This function returns a pointer to the head node on the chain.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ *
+ * @return This method returns the permanent head node of the chain.
  */
 RTEMS_INLINE_ROUTINE const rtems_chain_node *rtems_chain_immutable_head(
@@ -150,11 +151,11 @@
 
 /**
- *  @brief Return pointer to Chain Tail
- *
- *  This function returns a pointer to the tail node on the chain.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *
- *  @return This method returns the permanent tail node of the chain.
+ * @brief Return pointer to Chain Tail
+ *
+ * This function returns a pointer to the tail node on the chain.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ *
+ * @return This method returns the permanent tail node of the chain.
  */
 RTEMS_INLINE_ROUTINE rtems_chain_node *rtems_chain_tail(
@@ -165,11 +166,12 @@
 }
 
-/** @brief Return pointer to immutable Chain Tail
- *
- *  This function returns a pointer to the tail node on the chain.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *
- *  @return This method returns the permanent tail node of the chain.
+/** 
+ * @brief Return pointer to immutable Chain Tail
+ *
+ * This function returns a pointer to the tail node on the chain.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ *
+ * @return This method returns the permanent tail node of the chain.
  */
 RTEMS_INLINE_ROUTINE const rtems_chain_node *rtems_chain_immutable_tail(
@@ -181,12 +183,12 @@
 
 /**
- *  @brief Return pointer to Chain's First node after the permanent head.
- *
- *  This function returns a pointer to the first node on the chain after the
- *  head.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *
- *  @return This method returns the first node of the chain.
+ * @brief Return pointer to Chain's First node after the permanent head.
+ *
+ * This function returns a pointer to the first node on the chain after the
+ * head.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ *
+ * @return This method returns the first node of the chain.
  */
 RTEMS_INLINE_ROUTINE rtems_chain_node *rtems_chain_first(
@@ -197,12 +199,13 @@
 }
 
-/** @brief Return pointer to immutable Chain's First node
- *
- *  This function returns a pointer to the first node on the chain after the
- *  head.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *
- *  @return This method returns the first node of the chain.
+/** 
+ * @brief Return pointer to immutable Chain's First node
+ *
+ * This function returns a pointer to the first node on the chain after the
+ * head.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ *
+ * @return This method returns the first node of the chain.
  */
 RTEMS_INLINE_ROUTINE const rtems_chain_node *rtems_chain_immutable_first(
@@ -214,12 +217,12 @@
 
 /**
- *  @brief Return pointer to Chain's Last node before the permanent tail.
- *
- *  This function returns a pointer to the last node on the chain just before
- *  the tail.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *
- *  @return This method returns the last node of the chain.
+ * @brief Return pointer to Chain's Last node before the permanent tail.
+ *
+ * This function returns a pointer to the last node on the chain just before
+ * the tail.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ *
+ * @return This method returns the last node of the chain.
  */
 RTEMS_INLINE_ROUTINE rtems_chain_node *rtems_chain_last(
@@ -230,12 +233,13 @@
 }
 
-/** @brief Return pointer to immutable Chain's Last node
- *
- *  This function returns a pointer to the last node on the chain just before
- *  the tail.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *
- *  @return This method returns the last node of the chain.
+/**
+ * @brief Return pointer to immutable Chain's Last node
+ *
+ * This function returns a pointer to the last node on the chain just before
+ * the tail.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ *
+ * @return This method returns the last node of the chain.
  */
 RTEMS_INLINE_ROUTINE const rtems_chain_node *rtems_chain_immutable_last(
@@ -247,11 +251,11 @@
 
 /**
- *  @brief Return pointer the next node from this node
- *
- *  This function returns a pointer to the next node after this node.
- *
- *  @param[in] the_node is the node to be operated upon.
- *
- *  @return This method returns the next node on the chain.
+ * @brief Return pointer the next node from this node
+ *
+ * This function returns a pointer to the next node after this node.
+ *
+ * @param[in] the_node is the node to be operated upon.
+ *
+ * @return This method returns the next node on the chain.
  */
 RTEMS_INLINE_ROUTINE rtems_chain_node *rtems_chain_next(
@@ -262,11 +266,12 @@
 }
 
-/** @brief Return pointer the immutable next node from this node
- *
- *  This function returns a pointer to the next node after this node.
- *
- *  @param[in] the_node is the node to be operated upon.
- *
- *  @return This method returns the next node on the chain.
+/** 
+ * @brief Return pointer the immutable next node from this node
+ *
+ * This function returns a pointer to the next node after this node.
+ *
+ * @param[in] the_node is the node to be operated upon.
+ *
+ * @return This method returns the next node on the chain.
  */
 RTEMS_INLINE_ROUTINE const rtems_chain_node *rtems_chain_immutable_next(
@@ -278,11 +283,11 @@
 
 /**
- *  @brief Return pointer the previous node from this node
- *
- *  This function returns a pointer to the previous node on this chain.
- *
- *  @param[in] the_node is the node to be operated upon.
- *
- *  @return This method returns the previous node on the chain.
+ * @brief Return pointer the previous node from this node
+ *
+ * This function returns a pointer to the previous node on this chain.
+ *
+ * @param[in] the_node is the node to be operated upon.
+ *
+ * @return This method returns the previous node on the chain.
  */
 RTEMS_INLINE_ROUTINE rtems_chain_node *rtems_chain_previous(
@@ -293,11 +298,12 @@
 }
 
-/** @brief Return pointer the immutable previous node from this node
- *
- *  This function returns a pointer to the previous node on this chain.
- *
- *  @param[in] the_node is the node to be operated upon.
- *
- *  @return This method returns the previous node on the chain.
+/**
+ * @brief Return pointer the immutable previous node from this node.
+ *
+ * This function returns a pointer to the previous node on this chain.
+ *
+ * @param[in] the_node is the node to be operated upon.
+ *
+ * @return This method returns the previous node on the chain.
  */
 RTEMS_INLINE_ROUTINE const rtems_chain_node *rtems_chain_immutable_previous(
@@ -309,14 +315,14 @@
 
 /**
- *  @brief Are Two Nodes Equal
- *
- *  This function returns true if @a left and @a right are equal,
- *  and false otherwise.
- *
- *  @param[in] left is the node on the left hand side of the comparison.
- *  @param[in] right is the node on the left hand side of the comparison.
- *
- *  @return This function returns true if @a left and @a right are equal,
- *          and false otherwise.
+ * @brief Are Two nodes equal.
+ *
+ * This function returns true if @a left and @a right are equal,
+ * and false otherwise.
+ *
+ * @param[in] left is the node on the left hand side of the comparison.
+ * @param[in] right is the node on the left hand side of the comparison.
+ *
+ * @retval true @a left is equal to @a right.
+ * @retval false @a left is not equal to @a right
  */
 RTEMS_INLINE_ROUTINE bool rtems_chain_are_nodes_equal(
@@ -329,13 +335,13 @@
 
 /**
- *  @brief Is the Chain Empty
- *
- *  This function returns true if there a no nodes on @a the_chain and
- *  false otherwise.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *
- *  @return This function returns true if there a no nodes on @a the_chain and
- *  false otherwise.
+ * @brief Is the chain empty
+ *
+ * This function returns true if there a no nodes on @a the_chain and
+ * false otherwise.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ *
+ * @retval true The chain is empty.
+ * @retval false The chain is not empty.
  */
 RTEMS_INLINE_ROUTINE bool rtems_chain_is_empty(
@@ -347,14 +353,14 @@
 
 /**
- *  @brief Is this the First Node on the Chain
- *
- *  This function returns true if the_node is the first node on a chain and
- *  false otherwise.
- *
- *  @param[in] the_node is the node the caller wants to know if it is
- *             the first node on a chain.
- *
- *  @return This function returns true if @a the_node is the first node on
- *          a chain and false otherwise.
+ * @brief Is this the first node on the chain.
+ *
+ * This function returns true if the_node is the first node on a chain and
+ * false otherwise.
+ *
+ * @param[in] the_node is the node the caller wants to know if it is
+ *            the first node on a chain.
+ *
+ * @retval true @a the_node is the first node on a chain.
+ * @retval false @a the_node is not the first node on a chain.
  */
 RTEMS_INLINE_ROUTINE bool rtems_chain_is_first(
@@ -366,13 +372,13 @@
 
 /**
- *  @brief Is this the Last Node on the Chain
- *
- *  This function returns true if @a the_node is the last node on a chain and
- *  false otherwise.
- *
- *  @param[in] the_node is the node to check as the last node.
- *
- *  @return This function returns true if @a the_node is the last node on
- *          a chain and false otherwise.
+ * @brief Is this the last node on the chain.
+ *
+ * This function returns true if @a the_node is the last node on a chain and
+ * false otherwise.
+ *
+ * @param[in] the_node is the node to check as the last node.
+ *
+ * @retval true @a the_node is the last node on a chain.
+ * @retval false @a the_node is not the last node on a chain
  */
 RTEMS_INLINE_ROUTINE bool rtems_chain_is_last(
@@ -384,13 +390,13 @@
 
 /**
- *  @brief Does this Chain have only One Node
- *
- *  This function returns true if there is only one node on @a the_chain and
- *  false otherwise.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *
- *  @return This function returns true if there is only one node on
- *          @a the_chain and false otherwise.
+ * @brief Does this chain have only one node.
+ *
+ * This function returns true if there is only one node on @a the_chain and
+ * false otherwise.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ *
+ * @retval true The chain has only one node.
+ * @retval false The chain has more than one nodes.
  */
 RTEMS_INLINE_ROUTINE bool rtems_chain_has_only_one_node(
@@ -402,14 +408,14 @@
 
 /**
- *  @brief Is this Node the Chain Head
- *
- *  This function returns true if @a the_node is the head of the_chain and
- *  false otherwise.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *  @param[in] the_node is the node to check for being the Chain Head.
- *
- *  @return This function returns true if @a the_node is the head of
- *          @a the_chain and false otherwise.
+ * @brief Is this node the chain head.
+ *
+ * This function returns true if @a the_node is the head of the_chain and
+ * false otherwise.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ * @param[in] the_node is the node to check for being the Chain Head.
+ *
+ * @retval true @a the_node is the head of @a the_chain.
+ * @retval false @a the_node is not the head of @a the_chain.
  */
 RTEMS_INLINE_ROUTINE bool rtems_chain_is_head(
@@ -422,11 +428,14 @@
 
 /**
- *  @brief Is this Node the Chail Tail
- *
- *  This function returns true if the_node is the tail of the_chain and
- *  false otherwise.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *  @param[in] the_node is the node to check for being the Chain Tail.
+ * @brief Is this node the chain tail.
+ *
+ * This function returns true if the_node is the tail of the_chain and
+ * false otherwise.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ * @param[in] the_node is the node to check for being the Chain Tail.
+ * 
+ * @retval true @a the_node is the tail of @a the_chain.
+ * @retval false @a the_node is not the tail of @a the_chain.
  */
 RTEMS_INLINE_ROUTINE bool rtems_chain_is_tail(
@@ -439,11 +448,11 @@
 
 /**
- *  @brief Extract the specified node from a chain
- *
- *  This routine extracts @a the_node from the chain on which it resides.
- *  It disables interrupts to ensure the atomicity of the
- *  extract operation.
- *
- *  @arg the_node specifies the node to extract
+ * @brief Extract the specified node from a chain.
+ *
+ * This routine extracts @a the_node from the chain on which it resides.
+ * It disables interrupts to ensure the atomicity of the
+ * extract operation.
+ *
+ * @arg the_node specifies the node to extract
  */
 RTEMS_INLINE_ROUTINE void rtems_chain_extract(
@@ -455,10 +464,10 @@
 
 /**
- *  @brief Extract the specified node from a chain (unprotected).
- *
- *  This routine extracts @a the_node from the chain on which it resides.
- *
- *  @note It does NOT disable interrupts to ensure the atomicity of the
- *  append operation.
+ * @brief Extract the specified node from a chain (unprotected).
+ *
+ * This routine extracts @a the_node from the chain on which it resides.
+ *
+ * NOTE: It does NOT disable interrupts to ensure the atomicity of the
+ * append operation.
  */
 RTEMS_INLINE_ROUTINE void rtems_chain_extract_unprotected(
@@ -470,14 +479,14 @@
 
 /**
- *  @brief Obtain the first node on a chain
- *
- *  This function removes the first node from @a the_chain and returns
- *  a pointer to that node.  If @a the_chain is empty, then NULL is returned.
- *
- *  @return This method returns a pointer a node.  If a node was removed,
- *          then a pointer to that node is returned.  If @a the_chain was
- *          empty, then NULL is returned.
- *
- *  @note It disables interrupts to ensure the atomicity of the get operation.
+ * @brief Obtain the first node on a chain.
+ *
+ * This function removes the first node from @a the_chain and returns
+ * a pointer to that node.  If @a the_chain is empty, then NULL is returned.
+ *
+ * @return This method returns a pointer a node.  If a node was removed,
+ *         then a pointer to that node is returned.  If @a the_chain was
+ *         empty, then NULL is returned.
+ *
+ *  NOTE: It disables interrupts to ensure the atomicity of the get operation.
  */
 RTEMS_INLINE_ROUTINE rtems_chain_node *rtems_chain_get(
@@ -499,11 +508,11 @@
 
 /**
- *  @brief Insert a node on a chain
- *
- *  This routine inserts @a the_node on a chain immediately following
- *  @a after_node.  
- *
- *  @note It disables interrupts to ensure the atomicity
- *  of the extract operation.
+ * @brief Insert a node on a chain
+ *
+ * This routine inserts @a the_node on a chain immediately following
+ * @a after_node.  
+ *
+ * NOTE: It disables interrupts to ensure the atomicity
+ * of the extract operation.
  */
 RTEMS_INLINE_ROUTINE void rtems_chain_insert(
@@ -527,10 +536,10 @@
 
 /**
- *  @brief Append a node on the end of a chain
- *
- *  This routine appends @a the_node onto the end of @a the_chain.
- *
- *  @note It disables interrupts to ensure the atomicity of the
- *  append operation.
+ * @brief Append a node on the end of a chain.
+ *
+ * This routine appends @a the_node onto the end of @a the_chain.
+ *
+ * NOTE: It disables interrupts to ensure the atomicity of the
+ * append operation.
  */
 RTEMS_INLINE_ROUTINE void rtems_chain_append(
@@ -543,10 +552,10 @@
 
 /**
- *  @brief Append a node on the end of a chain (unprotected)
- *
- *  This routine appends @a the_node onto the end of @a the_chain.
- *
- *  @note It does NOT disable interrupts to ensure the atomicity of the
- *  append operation.
+ * @brief Append a node on the end of a chain (unprotected).
+ *
+ * This routine appends @a the_node onto the end of @a the_chain.
+ *
+ * NOTE: It does NOT disable interrupts to ensure the atomicity of the
+ * append operation.
  */
 RTEMS_INLINE_ROUTINE void rtems_chain_append_unprotected(
@@ -558,13 +567,14 @@
 }
 
-/** @brief Prepend a Node
- *
- *  This routine prepends the_node onto the front of the_chain.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *  @param[in] the_node is the node to be prepended.
- *
- *  @note It disables interrupts to ensure the atomicity of the
- *        prepend operation.
+/** 
+ * @brief Prepend a node.
+ *
+ * This routine prepends the_node onto the front of the_chain.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ * @param[in] the_node is the node to be prepended.
+ *
+ * NOTE: It disables interrupts to ensure the atomicity of the
+ *       prepend operation.
  */
 RTEMS_INLINE_ROUTINE void rtems_chain_prepend(
@@ -576,13 +586,14 @@
 }
 
-/** @brief Prepend a Node (unprotected)
- *
- *  This routine prepends the_node onto the front of the_chain.
- *
- *  @param[in] the_chain is the chain to be operated upon.
- *  @param[in] the_node is the node to be prepended.
- *
- *  @note It does NOT disable interrupts to ensure the atomicity of the
- *        prepend operation.
+/** 
+ * @brief Prepend a node (unprotected).
+ *
+ * This routine prepends the_node onto the front of the_chain.
+ *
+ * @param[in] the_chain is the chain to be operated upon.
+ * @param[in] the_node is the node to be prepended.
+ *
+ * NOTE: It does NOT disable interrupts to ensure the atomicity of the
+ *       prepend operation.
  */
 RTEMS_INLINE_ROUTINE void rtems_chain_prepend_unprotected(
Index: cpukit/sapi/inline/rtems/extension.inl
===================================================================
--- cpukit/sapi/inline/rtems/extension.inl	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/inline/rtems/extension.inl	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -4,5 +4,5 @@
  * @ingroup ClassicUserExtensions
  *
- * @brief User Extensions API.
+ * @brief User Extensions API
  */
 
Index: cpukit/sapi/inline/rtems/rbtree.inl
===================================================================
--- cpukit/sapi/inline/rtems/rbtree.inl	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/inline/rtems/rbtree.inl	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,17 +1,19 @@
 /**
- * @file rtems/rbtree.inl
- *
- *  This include file contains all the constants and structures associated
- *  with the RBTree API in RTEMS. The rbtree is a Red Black Tree that
- *  is part of the Super Core. This is the published interface to that
- *  code.
+ * @file
+ * 
+ * @brief Constants and Structures Associated with the RBTree API in RTEMS
+ *
+ * This include file contains all the constants and structures associated
+ * with the RBTree API in RTEMS. The rbtree is a Red Black Tree that
+ * is part of the Super Core. This is the published interface to that
+ * code.
  */
  
 /*
- *  Copyright (c) 2010-2012 Gedare Bloom.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
+ * Copyright (c) 2010-2012 Gedare Bloom.
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.com/license/LICENSE.
  */
 
@@ -26,9 +28,9 @@
 
 /**
- *  @brief Initialize a RBTree Header
- *
- *  This routine initializes @a the_rbtree structure to manage the
- *  contiguous array of @a number_nodes nodes which starts at
- *  @a starting_address.  Each node is of @a node_size bytes.
+ * @brief Initialize a RBTree header.
+ *
+ * This routine initializes @a the_rbtree structure to manage the
+ * contiguous array of @a number_nodes nodes which starts at
+ * @a starting_address.  Each node is of @a node_size bytes.
  */
 RTEMS_INLINE_ROUTINE void rtems_rbtree_initialize(
@@ -46,7 +48,7 @@
 
 /**
- *  @brief Initialize this RBTree as Empty
- *
- *  This routine initializes @a the_rbtree to contain zero nodes.
+ * @brief Initialize this RBTree as Empty
+ *
+ * This routine initializes @a the_rbtree to contain zero nodes.
  */
 RTEMS_INLINE_ROUTINE void rtems_rbtree_initialize_empty(
@@ -60,8 +62,8 @@
 
 /**
- *  @brief Set off rbtree
- *
- *  This function sets the next and previous fields of the @a node to NULL
- *  indicating the @a node is not part of any rbtree.
+ * @brief Set off RBtree.
+ *
+ * This function sets the next and previous fields of the @a node to NULL
+ * indicating the @a node is not part of any rbtree.
  */
 RTEMS_INLINE_ROUTINE void rtems_rbtree_set_off_rbtree(
@@ -73,8 +75,8 @@
 
 /**
- *  @brief Is the Node off RBTree
- *
- *  This function returns true if the @a node is not on a rbtree. A @a node is
- *  off rbtree if the next and previous fields are set to NULL.
+ * @brief Is the Node off RBTree.
+ *
+ * This function returns true if the @a node is not on a rbtree. A @a node is
+ * off rbtree if the next and previous fields are set to NULL.
  */
 RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_node_off_rbtree(
@@ -86,7 +88,7 @@
 
 /**
- *  @brief Is the RBTree Node Pointer NULL
- *
- *  This function returns true if @a the_node is NULL and false otherwise.
+ * @brief Is the RBTree Node Pointer NULL.
+ *
+ * This function returns true if @a the_node is NULL and false otherwise.
  */
 RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_null_node(
@@ -98,7 +100,7 @@
 
 /**
- *  @brief Return pointer to RBTree Root
- *
- *  This function returns a pointer to the root node of @a the_rbtree.
+ * @brief Return pointer to RBTree root.
+ *
+ * This function returns a pointer to the root node of @a the_rbtree.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_root(
@@ -110,7 +112,7 @@
 
 /**
- *  @brief Return pointer to RBTree Minimum
- *
- *  This function returns a pointer to the minimum node of @a the_rbtree.
+ * @brief Return pointer to RBTree Minimum
+ *
+ * This function returns a pointer to the minimum node of @a the_rbtree.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_min(
@@ -122,7 +124,7 @@
 
 /**
- *  @brief Return pointer to RBTree Maximum
- *
- *  This function returns a pointer to the maximum node of @a the_rbtree.
+ * @brief Return pointer to RBTree maximum.
+ *
+ * This function returns a pointer to the maximum node of @a the_rbtree.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_max(
@@ -134,7 +136,7 @@
 
 /**
- *  @brief Return pointer to the left child node from this node
- *
- *  This function returns a pointer to the left child node of @a the_node.
+ * @brief Return pointer to the left child node from this node.
+ *
+ * This function returns a pointer to the left child node of @a the_node.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_left(
@@ -146,7 +148,7 @@
 
 /**
- *  @brief Return pointer to the right child node from this node
- *
- *  This function returns a pointer to the right child node of @a the_node.
+ * @brief Return pointer to the right child node from this node.
+ *
+ * This function returns a pointer to the right child node of @a the_node.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_right(
@@ -158,7 +160,7 @@
 
 /**
- *  @brief Return pointer to the parent child node from this node
- *
- *  This function returns a pointer to the parent node of @a the_node.
+ * @brief Return pointer to the parent child node from this node.
+ *
+ * This function returns a pointer to the parent node of @a the_node.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_parent(
@@ -170,8 +172,8 @@
 
 /**
- *  @brief Are Two Nodes Equal
- *
- *  This function returns true if @a left and @a right are equal,
- *  and false otherwise.
+ * @brief Are two nodes equal.
+ *
+ * This function returns true if @a left and @a right are equal,
+ * and false otherwise.
  */
 RTEMS_INLINE_ROUTINE bool rtems_rbtree_are_nodes_equal(
@@ -184,8 +186,8 @@
 
 /**
- *  @brief Is the RBTree Empty
- *
- *  This function returns true if there a no nodes on @a the_rbtree and
- *  false otherwise.
+ * @brief Is the RBTree empty.
+ *
+ * This function returns true if there a no nodes on @a the_rbtree and
+ * false otherwise.
  */
 RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_empty(
@@ -197,8 +199,8 @@
 
 /**
- *  @brief Is this the Minimum Node on the RBTree
- *
- *  This function returns true if @a the_node is the min node on @a the_rbtree 
- *  and false otherwise.
+ * @brief Is this the minimum node on the RBTree.
+ *
+ * This function returns true if @a the_node is the min node on @a the_rbtree 
+ * and false otherwise.
  */
 RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_min(
@@ -211,8 +213,8 @@
 
 /**
- *  @brief Is this the Maximum Node on the RBTree
- *
- *  This function returns true if @a the_node is the max node on @a the_rbtree 
- *  and false otherwise.
+ * @brief Is this the maximum node on the RBTree.
+ *
+ * This function returns true if @a the_node is the max node on @a the_rbtree 
+ * and false otherwise.
  */
 RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_max(
@@ -226,8 +228,8 @@
 
 /**
- *  @brief Does this RBTree have only One Node
- *
- *  This function returns true if there is only one node on @a the_rbtree and
- *  false otherwise.
+ * @brief Does this RBTree have only one node.
+ *
+ * This function returns true if there is only one node on @a the_rbtree and
+ * false otherwise.
  */
 RTEMS_INLINE_ROUTINE bool rtems_rbtree_has_only_one_node(
@@ -239,8 +241,8 @@
 
 /**
- *  @brief Is this Node the RBTree Root
- *
- *  This function returns true if @a the_node is the root of @a the_rbtree and
- *  false otherwise.
+ * @brief Is this node the RBTree root.
+ *
+ * This function returns true if @a the_node is the root of @a the_rbtree and
+ * false otherwise.
  */
 RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_root(
@@ -263,12 +265,12 @@
 }
 
-/** @brief Find the node with given key in the tree
- *
- *  This function returns a pointer to the node having key equal to the key
- *  of @a the_node if it exists within @a the_rbtree, and NULL if not.
- *  @a the_node has to be made up before a search.
- *
- *  @note If the tree is not unique and contains duplicate keys, the set
- *        of duplicate keys acts as FIFO.
+/** @brief Find the node with given key in the tree.
+ *
+ * This function returns a pointer to the node having key equal to the key
+ * of @a the_node if it exists within @a the_rbtree, and NULL if not.
+ * @a the_node has to be made up before a search.
+ *
+ * @note If the tree is not unique and contains duplicate keys, the set
+ *       of duplicate keys acts as FIFO.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node* rtems_rbtree_find(
@@ -332,8 +334,8 @@
 
 /**
- *  @brief Extract the specified node from a rbtree
- *
- *  This routine extracts @a the_node from @a the_rbtree on which it resides.
- *  It disables interrupts to ensure the atomicity of the extract operation.
+ * @brief Extract the specified node from a rbtree.
+ *
+ * This routine extracts @a the_node from @a the_rbtree on which it resides.
+ * It disables interrupts to ensure the atomicity of the extract operation.
  */
 RTEMS_INLINE_ROUTINE void rtems_rbtree_extract(
@@ -346,8 +348,8 @@
 
 /**
- *  @brief Obtain the min node on a rbtree
- *
- *  This function removes the min node from @a the_rbtree and returns
- *  a pointer to that node.  If @a the_rbtree is empty, then NULL is returned.
+ * @brief Obtain the min node on a rbtree.
+ *
+ * This function removes the min node from @a the_rbtree and returns
+ * a pointer to that node.  If @a the_rbtree is empty, then NULL is returned.
  */
 
@@ -360,9 +362,9 @@
 
 /**
- *  @brief Obtain the min node on a rbtree
- *
- *  This function removes the min node from @a the_rbtree and returns
- *  a pointer to that node.  If @a the_rbtree is empty, then NULL is returned.
- *  It disables interrupts to ensure the atomicity of the get operation.
+ * @brief Obtain the min node on a rbtree.
+ *
+ * This function removes the min node from @a the_rbtree and returns
+ * a pointer to that node.  If @a the_rbtree is empty, then NULL is returned.
+ * It disables interrupts to ensure the atomicity of the get operation.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_get_min(
@@ -374,8 +376,8 @@
 
 /**
- *  @brief Obtain the max node on a rbtree
- *
- *  This function removes the max node from @a the_rbtree and returns
- *  a pointer to that node.  If @a the_rbtree is empty, then NULL is returned.
+ * @brief Obtain the max node on a rbtree.
+ *
+ * This function removes the max node from @a the_rbtree and returns
+ * a pointer to that node.  If @a the_rbtree is empty, then NULL is returned.
  */
 
@@ -388,9 +390,9 @@
 
 /**
- *  @brief Obtain the max node on a rbtree
- *
- *  This function removes the max node from @a the_rbtree and returns
- *  a pointer to that node.  If @a the_rbtree is empty, then NULL is returned.
- *  It disables interrupts to ensure the atomicity of the get operation.
+ * @brief Obtain the max node on a rbtree.
+ *
+ * This function removes the max node from @a the_rbtree and returns
+ * a pointer to that node.  If @a the_rbtree is empty, then NULL is returned.
+ * It disables interrupts to ensure the atomicity of the get operation.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_get_max(
@@ -402,9 +404,9 @@
 
 /**
- *  @brief Peek at the min node on a rbtree
- *
- *  This function returns a pointer to the min node from @a the_rbtree 
- *  without changing the tree.  If @a the_rbtree is empty, 
- *  then NULL is returned.
+ * @brief Peek at the min node on a rbtree.
+ *
+ * This function returns a pointer to the min node from @a the_rbtree 
+ * without changing the tree.  If @a the_rbtree is empty, 
+ * then NULL is returned.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_peek_min(
@@ -416,9 +418,9 @@
 
 /**
- *  @brief Peek at the max node on a rbtree
- *
- *  This function returns a pointer to the max node from @a the_rbtree 
- *  without changing the tree.  If @a the_rbtree is empty, 
- *  then NULL is returned.
+ * @brief Peek at the max node on a rbtree.
+ *
+ * This function returns a pointer to the max node from @a the_rbtree 
+ * without changing the tree.  If @a the_rbtree is empty, 
+ * then NULL is returned.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_peek_max(
@@ -440,9 +442,9 @@
 
 /**
- *  @brief Find the control header of the tree containing a given node.
- *
- *  This routine finds the rtems_rbtree_control structure of the tree 
- *  containing @a the_node.
- *  It disables interrupts to ensure the atomicity of the find operation.
+ * @brief Find the control header of the tree containing a given node.
+ *
+ * This routine finds the rtems_rbtree_control structure of the tree 
+ * containing @a the_node.
+ * It disables interrupts to ensure the atomicity of the find operation.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_control *rtems_rbtree_find_header(
@@ -465,13 +467,13 @@
 
 /**
- *  @brief Insert a node on a rbtree
- *
- *  This routine inserts @a the_node on @a the_rbtree.
- *  It disables interrupts to ensure the atomicity of the insert operation.
- *
- *  @retval 0 Successfully inserted.
- *  @retval -1 NULL @a the_node.
- *  @retval RBTree_Node* if one with equal key to the key of @a the_node exists
- *          in an unique @a the_rbtree.
+ * @brief Insert a node on a rbtree.
+ *
+ * This routine inserts @a the_node on @a the_rbtree.
+ * It disables interrupts to ensure the atomicity of the insert operation.
+ *
+ * @retval 0 Successfully inserted.
+ * @retval -1 NULL @a the_node.
+ * @retval RBTree_Node* if one with equal key to the key of @a the_node exists
+ *         in an unique @a the_rbtree.
  */
 RTEMS_INLINE_ROUTINE rtems_rbtree_node *rtems_rbtree_insert(
@@ -483,5 +485,6 @@
 }
 
-/** @brief Determines whether the tree is unique
+/** 
+ * @brief Determines whether the tree is unique.
  */
 RTEMS_INLINE_ROUTINE bool rtems_rbtree_is_unique(
Index: cpukit/sapi/inline/rtems/timespec.inl
===================================================================
--- cpukit/sapi/inline/rtems/timespec.inl	(revision f2f39b62a284afefbf8f1840255602162a9b2a01)
+++ cpukit/sapi/inline/rtems/timespec.inl	(revision 27f071cd88134b995f562e7080ba9820f93d48df)
@@ -1,8 +1,6 @@
 /**
- * @file rtems/sapi/timespec.inl
- *
- * @ingroup 
- *
- * @brief Timespec API.
+ * @file
+ *
+ * @brief Timespec API
  */
  
@@ -32,12 +30,12 @@
 
 /**
- * @brief Is Timespec Valid
- *
- *  This method determines the validity of a timespec.
- *
- *  @param[in] time is the timespec instance to validate.
- *
- *  @return This method returns true if @a time is valid and
- *          false otherwise.
+ * @brief Is timespec valid
+ *
+ * This method determines the validity of a timespec.
+ *
+ * @param[in] time is the timespec instance to validate.
+ *
+ * @retval true The timespec is valid.
+ * @retval false The timespec is not valid.
  */
 RTEMS_INLINE_ROUTINE bool rtems_timespec_is_valid(
@@ -49,13 +47,14 @@
 
 /**
- * @brief Timespec Less Than Operator
- *
- *  This method is the less than operator for timespecs.
- *
- *  @param[in] lhs is the left hand side timespec
- *  @param[in] rhs is the right hand side timespec
- *
- *  @return This method returns true if @a lhs is less than the @a rhs and
- *          false otherwise.
+ * @brief Timespec less than operator.
+ *
+ * This method is the less than operator for timespecs.
+ *
+ * @param[in] lhs is the left hand side timespec
+ * @param[in] rhs is the right hand side timespec
+ *
+ * @retval true @a lhs is less than @a rhr.
+ * @retval false @a lhs is not less than @a rhr.
+ * 
  */
 RTEMS_INLINE_ROUTINE bool rtems_timespec_less_than(
@@ -68,13 +67,13 @@
 
 /**
- * @brief Add to a Timespec
- *
- *  This routine adds two timespecs.  The second argument is added
- *  to the first.
- *
- *  @param[in] time is the base time to be added to
- *  @param[in] add is the timespec to add to the first argument
- *
- *  @return This method returns the number of seconds @a time increased by.
+ * @brief Add to a timespec.
+ *
+ * This routine adds two timespecs.  The second argument is added
+ * to the first.
+ *
+ * @param[in] time is the base time to be added to
+ * @param[in] add is the timespec to add to the first argument
+ *
+ * @return This method returns the number of seconds @a time increased by.
  */
 RTEMS_INLINE_ROUTINE uint32_t rtems_timespec_add_to(
@@ -87,12 +86,12 @@
 
 /**
- * @brief Convert Timespec to Number of Ticks
- *
- *  This routine convert the @a time timespec to the corresponding number
- *  of clock ticks.
- *
- *  @param[in] time is the time to be converted
- *
- *  @return This method returns the number of ticks computed.
+ * @brief Convert timespec to number of ticks.
+ *
+ * This routine convert the @a time timespec to the corresponding number
+ * of clock ticks.
+ *
+ * @param[in] time is the time to be converted
+ *
+ * @return This method returns the number of ticks computed.
  */
 RTEMS_INLINE_ROUTINE uint32_t rtems_timespec_to_ticks(
@@ -104,11 +103,11 @@
 
 /**
- * @brief Convert Ticks to Timespec
- *
- *  This routine converts the @a ticks value to the corresponding
- *  timespec format @a time.
- *
- *  @param[in] time is the timespec format time result
- *  @param[in] ticks is the number of ticks to convert
+ * @brief Convert ticks to timespec.
+ *
+ * This routine converts the @a ticks value to the corresponding
+ * timespec format @a time.
+ *
+ * @param[in] time is the timespec format time result
+ * @param[in] ticks is the number of ticks to convert
  */
 
@@ -122,14 +121,14 @@
 
 /**
- * @brief Subtract Two Timespec
- *
- *  This routine subtracts two timespecs.  @a result is set to
- *  @a end - @a start.
- *
- *  @param[in] start is the starting time
- *  @param[in] end is the ending time
- *  @param[in] result is the difference between starting and ending time.
- *
- *  @return This method fills in @a result.
+ * @brief Subtract two timespec.
+ *
+ * This routine subtracts two timespecs.  @a result is set to
+ * @a end - @a start.
+ *
+ * @param[in] start is the starting time
+ * @param[in] end is the ending time
+ * @param[in] result is the difference between starting and ending time.
+ *
+ * @return This method fills in @a result.
  */
 RTEMS_INLINE_ROUTINE void rtems_timespec_subtract(
@@ -143,15 +142,15 @@
 
 /**
- * @brief Divide Timespec By Integer
- *
- *  This routine divides a timespec by an integer value.  The expected
- *  use is to assist in benchmark calculations where you typically
- *  divide a duration by a number of iterations.
- *
- *  @param[in] time is the total
- *  @param[in] iterations is the number of iterations
- *  @param[in] result is the average time.
- *
- *  @return This method fills in @a result.
+ * @brief Divide timespec by integer.
+ *
+ * This routine divides a timespec by an integer value.  The expected
+ * use is to assist in benchmark calculations where you typically
+ * divide a duration by a number of iterations.
+ *
+ * @param[in] time is the total
+ * @param[in] iterations is the number of iterations
+ * @param[in] result is the average time.
+ *
+ * @return This method fills in @a result.
  */
 RTEMS_INLINE_ROUTINE void rtems_timespec_divide_by_integer(
@@ -165,15 +164,15 @@
 
 /**
- * @brief Divide Timespec
- *
- *  This routine divides a timespec by another timespec.  The
- *  intended use is for calculating percentages to three decimal points.
- *
- *  @param[in] lhs is the left hand number
- *  @param[in] rhs is the right hand number
- *  @param[in] ival_percentage is the integer portion of the average
- *  @param[in] fval_percentage is the thousandths of percentage
- *
- *  @return This method fills in @a result.
+ * @brief Divide timespec.
+ *
+ * This routine divides a timespec by another timespec.  The
+ * intended use is for calculating percentages to three decimal points.
+ *
+ * @param[in] lhs is the left hand number
+ * @param[in] rhs is the right hand number
+ * @param[in] ival_percentage is the integer portion of the average
+ * @param[in] fval_percentage is the thousandths of percentage
+ *
+ * @return This method fills in @a result.
  */
 RTEMS_INLINE_ROUTINE void rtems_timespec_divide(
@@ -188,12 +187,12 @@
 
 /**
- * @brief Set Timespec to Seconds Nanosecond
- *
- *  This method sets the timespec to the specified seconds and nanoseconds
- *  value.
- *
- *  @param[in] _time points to the timespec instance to validate.
- *  @param[in] _seconds is the seconds portion of the timespec
- *  @param[in] _nanoseconds is the nanoseconds portion of the timespec
+ * @brief Set timespec to seconds nanosecond.
+ *
+ * This method sets the timespec to the specified seconds and nanoseconds
+ * value.
+ *
+ * @param[in] _time points to the timespec instance to validate.
+ * @param[in] _seconds is the seconds portion of the timespec
+ * @param[in] _nanoseconds is the nanoseconds portion of the timespec
  */
 RTEMS_INLINE_ROUTINE void rtems_timespec_set(
@@ -207,10 +206,10 @@
 
 /**
- * @brief Zero Timespec
- *
- *  This method sets the timespec to zero.
- *  value.
- *
- *  @param[in] _time points to the timespec instance to zero.
+ * @brief Zero timespec.
+ *
+ * This method sets the timespec to zero.
+ * value.
+ *
+ * @param[in] _time points to the timespec instance to zero.
  */
 RTEMS_INLINE_ROUTINE void rtems_timespec_zero( 
@@ -222,11 +221,11 @@
 
 /**
- * @brief Get Seconds Portion of Timespec
- *
- *  This method returns the seconds portion of the specified timespec
- *
- *  @param[in] _time points to the timespec
- *
- *  @return The seconds portion of @a _time.
+ * @brief Get seconds portion of timespec.
+ *
+ * This method returns the seconds portion of the specified timespec
+ *
+ * @param[in] _time points to the timespec
+ *
+ * @return The seconds portion of @a _time.
  */
 RTEMS_INLINE_ROUTINE time_t rtems_timespec_get_seconds(
@@ -238,11 +237,11 @@
 
 /**
- * @brief Get Nanoseconds Portion of Timespec
- *
- *  This method returns the nanoseconds portion of the specified timespec
- *
- *  @param[in] _time points to the timespec
- *
- *  @return The nanoseconds portion of @a _time.
+ * @brief Get nanoseconds portion of timespec.
+ *
+ * This method returns the nanoseconds portion of the specified timespec
+ *
+ * @param[in] _time points to the timespec
+ *
+ * @return The nanoseconds portion of @a _time.
  */
 RTEMS_INLINE_ROUTINE uint32_t rtems_timespec_get_nanoseconds(
@@ -255,13 +254,13 @@
 
 /**
- * @brief Timespec Greater Than Operator
- *
- *  This method is the greater than operator for timespecs.
- *
- *  @param[in] lhs is the left hand side timespec
- *  @param[in] rhs is the right hand side timespec
- *
- *  @return This method returns true if @a lhs is greater than the @a rhs and
- *          false otherwise.
+ * @brief Timespec greater than operator.
+ *
+ * This method is the greater than operator for timespecs.
+ *
+ * @param[in] lhs is the left hand side timespec
+ * @param[in] rhs is the right hand side timespec
+ *
+ * @retval true @a lhs is greater than @a rhr.
+ * @retval false @a lhs is not greater than @a rhr.
  */
 RTEMS_INLINE_ROUTINE bool rtems_timespec_greater_than(
@@ -275,11 +274,11 @@
  * @brief Timespec equal to Operator
  *
- *  This method is the is equal to than operator for timespecs.
- *
- *  @param[in] lhs is the left hand side timespec
- *  @param[in] rhs is the right hand side timespec
- *
- *  @return This method returns true if @a lhs is equal to  @a rhs and
- *          false otherwise.
+ * This method is the is equal to than operator for timespecs.
+ *
+ * @param[in] lhs is the left hand side timespec
+ * @param[in] rhs is the right hand side timespec
+ *
+ * @retval true @a lhs is equal to @a rhr.
+ * @retval false @a lhs is not equal to @a rhr.
  */
 RTEMS_INLINE_ROUTINE bool rtems_timespec_equal_to(
