2011-06-17 Joel Sherrill <joel.sherrill@oarcorp.com>

	* rtems/include/rtems/rtems/types.h,
	score/include/rtems/score/address.h,
	score/include/rtems/score/apiext.h,
	score/include/rtems/score/bitfield.h,
	score/include/rtems/score/context.h,
	score/include/rtems/score/corebarrier.h,
	score/include/rtems/score/coremsg.h,
	score/include/rtems/score/coremutex.h,
	score/include/rtems/score/corerwlock.h,
	score/include/rtems/score/coresem.h,
	score/include/rtems/score/corespinlock.h,
	score/include/rtems/score/interr.h, score/include/rtems/score/isr.h,
	score/include/rtems/score/mpci.h, score/include/rtems/score/mppkt.h,
	score/include/rtems/score/objectmp.h,
	score/include/rtems/score/percpu.h,
	score/include/rtems/score/priority.h,
	score/include/rtems/score/rbtree.h,
	score/include/rtems/score/scheduler.h,
	score/include/rtems/score/smp.h, score/include/rtems/score/smplock.h,
	score/include/rtems/score/stack.h,
	score/include/rtems/score/states.h,
	score/include/rtems/score/thread.h,
	score/include/rtems/score/threadq.h,
	score/include/rtems/score/threadsync.h,
	score/include/rtems/score/timespec.h,
	score/include/rtems/score/timestamp.h,
	score/include/rtems/score/timestamp64.h,
	score/include/rtems/score/tod.h, score/include/rtems/score/tqdata.h,
	score/include/rtems/score/watchdog.h,
	score/include/rtems/score/wkspace.h: Mark Score files as in Score
	Group to improve Doxygen output.

35 files changed, 106 insertions, 2 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 7a5b7817bc..f46c98a9da 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,5 +1,39 @@
 2011-06-17	Joel Sherrill <joel.sherrill@oarcorp.com>
 
+	* rtems/include/rtems/rtems/types.h,
+	score/include/rtems/score/address.h,
+	score/include/rtems/score/apiext.h,
+	score/include/rtems/score/bitfield.h,
+	score/include/rtems/score/context.h,
+	score/include/rtems/score/corebarrier.h,
+	score/include/rtems/score/coremsg.h,
+	score/include/rtems/score/coremutex.h,
+	score/include/rtems/score/corerwlock.h,
+	score/include/rtems/score/coresem.h,
+	score/include/rtems/score/corespinlock.h,
+	score/include/rtems/score/interr.h, score/include/rtems/score/isr.h,
+	score/include/rtems/score/mpci.h, score/include/rtems/score/mppkt.h,
+	score/include/rtems/score/objectmp.h,
+	score/include/rtems/score/percpu.h,
+	score/include/rtems/score/priority.h,
+	score/include/rtems/score/rbtree.h,
+	score/include/rtems/score/scheduler.h,
+	score/include/rtems/score/smp.h, score/include/rtems/score/smplock.h,
+	score/include/rtems/score/stack.h,
+	score/include/rtems/score/states.h,
+	score/include/rtems/score/thread.h,
+	score/include/rtems/score/threadq.h,
+	score/include/rtems/score/threadsync.h,
+	score/include/rtems/score/timespec.h,
+	score/include/rtems/score/timestamp.h,
+	score/include/rtems/score/timestamp64.h,
+	score/include/rtems/score/tod.h, score/include/rtems/score/tqdata.h,
+	score/include/rtems/score/watchdog.h,
+	score/include/rtems/score/wkspace.h: Mark Score files as in Score
+	Group to improve Doxygen output.
+
+2011-06-17	Joel Sherrill <joel.sherrill@oarcorp.com>
+
 	* libcsupport/include/rtems/malloc.h, libmisc/stackchk/stackchk.h,
 	posix/include/rtems/posix/time.h, rtems/include/rtems/rtems/object.h,
 	score/include/rtems/score/apiext.h,
diff --git a/cpukit/rtems/include/rtems/rtems/types.h b/cpukit/rtems/include/rtems/rtems/types.h
index 2ceeeaa203..9a26edf5f1 100644
--- a/cpukit/rtems/include/rtems/rtems/types.h
+++ b/cpukit/rtems/include/rtems/rtems/types.h
@@ -125,7 +125,7 @@ typedef Watchdog_Interval rtems_interval;
 /**
  * @brief Represents the CPU usage per thread.
  *
- * When using nano seconds granularity timing, RTEMS may internally use a
+ * When using nanoseconds granularity timing, RTEMS may internally use a
  * variety of representations.
  */
 #ifndef __RTEMS_USE_TICKS_FOR_STATISTICS__
diff --git a/cpukit/score/include/rtems/score/address.h b/cpukit/score/include/rtems/score/address.h
index 034d905d32..6270e17dd4 100644
--- a/cpukit/score/include/rtems/score/address.h
+++ b/cpukit/score/include/rtems/score/address.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup ScoreAddress Address Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which abstracts address
  *  manipulation in a portable manner.
  */
diff --git a/cpukit/score/include/rtems/score/apiext.h b/cpukit/score/include/rtems/score/apiext.h
index d90c866d04..10291fddee 100644
--- a/cpukit/score/include/rtems/score/apiext.h
+++ b/cpukit/score/include/rtems/score/apiext.h
@@ -21,6 +21,8 @@
 /**
  *  @defgroup ScoreAPIExtension API Extension Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which provides mechanisms for the
  *  SuperCore to perform API specific actions without there beingg
  *  "up-references" from the SuperCore to APIs.  If these referencesg
diff --git a/cpukit/score/include/rtems/score/bitfield.h b/cpukit/score/include/rtems/score/bitfield.h
index 43f8fd09c4..4e267e04f7 100644
--- a/cpukit/score/include/rtems/score/bitfield.h
+++ b/cpukit/score/include/rtems/score/bitfield.h
@@ -21,6 +21,8 @@
 /**
  *  @defgroup ScoreBitfield Bitfield Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality that is used to manipulate the
  *  priority bitfields used to lookup which priority has the highest
  *  priority ready to execute thread.
diff --git a/cpukit/score/include/rtems/score/context.h b/cpukit/score/include/rtems/score/context.h
index 34baf32669..f6a0971673 100644
--- a/cpukit/score/include/rtems/score/context.h
+++ b/cpukit/score/include/rtems/score/context.h
@@ -21,6 +21,8 @@
 /**
  *  @defgroup ScoreContext Context Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which abstracts thread context
  *  management in a portable manner.
  *
diff --git a/cpukit/score/include/rtems/score/corebarrier.h b/cpukit/score/include/rtems/score/corebarrier.h
index 05ec152487..d1cc0e0a69 100644
--- a/cpukit/score/include/rtems/score/corebarrier.h
+++ b/cpukit/score/include/rtems/score/corebarrier.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup ScoreBarrier Barrier Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which provides the foundation
  *  Barrier services used in all of the APIs supported by RTEMS.
  */
diff --git a/cpukit/score/include/rtems/score/coremsg.h b/cpukit/score/include/rtems/score/coremsg.h
index 4a93f6de25..b43e670226 100644
--- a/cpukit/score/include/rtems/score/coremsg.h
+++ b/cpukit/score/include/rtems/score/coremsg.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup ScoreMessageQueue Message Queue Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which provides the foundation
  *  Message Queue services used in all of the APIs supported by RTEMS.
  */
diff --git a/cpukit/score/include/rtems/score/coremutex.h b/cpukit/score/include/rtems/score/coremutex.h
index e7174e3164..82e078cc6c 100644
--- a/cpukit/score/include/rtems/score/coremutex.h
+++ b/cpukit/score/include/rtems/score/coremutex.h
@@ -25,6 +25,8 @@
 /**
  *  @defgroup ScoreMutex Mutex Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which provides the foundation
  *  Mutex services used in all of the APIs supported by RTEMS.
  */
diff --git a/cpukit/score/include/rtems/score/corerwlock.h b/cpukit/score/include/rtems/score/corerwlock.h
index f97e4679b8..15183e47d5 100644
--- a/cpukit/score/include/rtems/score/corerwlock.h
+++ b/cpukit/score/include/rtems/score/corerwlock.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup ScoreRWLock RWLock Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which provides the foundation
  *  RWLock services used in all of the APIs supported by RTEMS.
  */
diff --git a/cpukit/score/include/rtems/score/coresem.h b/cpukit/score/include/rtems/score/coresem.h
index cf89e629d7..cb1e1b1f92 100644
--- a/cpukit/score/include/rtems/score/coresem.h
+++ b/cpukit/score/include/rtems/score/coresem.h
@@ -24,6 +24,8 @@
 /**
  *  @defgroup ScoreSemaphore Semaphore Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which provides the foundation
  *  Semaphore services used in all of the APIs supported by RTEMS.
  */
diff --git a/cpukit/score/include/rtems/score/corespinlock.h b/cpukit/score/include/rtems/score/corespinlock.h
index e8ba1fde07..1665b19d55 100644
--- a/cpukit/score/include/rtems/score/corespinlock.h
+++ b/cpukit/score/include/rtems/score/corespinlock.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup ScoreSpinlock Spinlock Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which provides the foundation
  *  Spinlock services used in all of the APIs supported by RTEMS.
  */
diff --git a/cpukit/score/include/rtems/score/interr.h b/cpukit/score/include/rtems/score/interr.h
index 32580b0e20..8eb838e4cb 100644
--- a/cpukit/score/include/rtems/score/interr.h
+++ b/cpukit/score/include/rtems/score/interr.h
@@ -27,6 +27,8 @@
 /**
  *  @defgroup ScoreIntErr Internal Error Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which provides the foundation
  *  Semaphore services used in all of the APIs supported by RTEMS.
  */
diff --git a/cpukit/score/include/rtems/score/isr.h b/cpukit/score/include/rtems/score/isr.h
index c164b8fcff..e75dae5ab0 100644
--- a/cpukit/score/include/rtems/score/isr.h
+++ b/cpukit/score/include/rtems/score/isr.h
@@ -26,6 +26,8 @@
 /**
  *  @defgroup ScoreISR ISR Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which provides the foundation
  *  ISR services used in all of the APIs supported by RTEMS.
  *
diff --git a/cpukit/score/include/rtems/score/mpci.h b/cpukit/score/include/rtems/score/mpci.h
index 397d526ffc..6ae6687af2 100644
--- a/cpukit/score/include/rtems/score/mpci.h
+++ b/cpukit/score/include/rtems/score/mpci.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup ScoreMPCI MPCI Handler
  *
+ *  @ingroup Score
+ *
  *  The MPCI Handler encapsulates functionality which is related to the
  *  generation, receipt, and processing of remote operations in a
  *  multiprocessor system.  This handler contains the message passing
diff --git a/cpukit/score/include/rtems/score/mppkt.h b/cpukit/score/include/rtems/score/mppkt.h
index db8e60d0df..b590b23385 100644
--- a/cpukit/score/include/rtems/score/mppkt.h
+++ b/cpukit/score/include/rtems/score/mppkt.h
@@ -25,6 +25,8 @@
 /**
  *  @defgroup ScoreMPPacket MP Packet Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates the primary definition of MPCI packets.  This
  *  handler defines the part of the packet that is common to all remote
  *  operations.
diff --git a/cpukit/score/include/rtems/score/objectmp.h b/cpukit/score/include/rtems/score/objectmp.h
index 04a1601716..fcf9dd166c 100644
--- a/cpukit/score/include/rtems/score/objectmp.h
+++ b/cpukit/score/include/rtems/score/objectmp.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup ScoreObjectMP Object Handler Multiprocessing Support
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which is used to manage
  *  objects which have been declared to be globally visible.  This handler
  *  knows objects from all of the nodes in the system.
diff --git a/cpukit/score/include/rtems/score/percpu.h b/cpukit/score/include/rtems/score/percpu.h
index 0e116800a8..aab396787e 100644
--- a/cpukit/score/include/rtems/score/percpu.h
+++ b/cpukit/score/include/rtems/score/percpu.h
@@ -39,6 +39,8 @@
 /**
  *  @defgroup PerCPU RTEMS Per CPU Information
  *
+ *  @ingroup Score
+ *
  *  This defines the per CPU state information required by RTEMS
  *  and the BSP.  In an SMP configuration, there will be multiple
  *  instances of this data structure -- one per CPU -- and the
diff --git a/cpukit/score/include/rtems/score/priority.h b/cpukit/score/include/rtems/score/priority.h
index 05dc939d84..db423de481 100644
--- a/cpukit/score/include/rtems/score/priority.h
+++ b/cpukit/score/include/rtems/score/priority.h
@@ -23,6 +23,8 @@
 /**
  *  @defgroup ScorePriority Priority Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which is used to manage
  *  thread priorities.  At the SuperCore level 256 priority levels
  *  are supported with lower numbers representing logically more important
diff --git a/cpukit/score/include/rtems/score/rbtree.h b/cpukit/score/include/rtems/score/rbtree.h
index 5e4ccadd0f..a3c5639767 100644
--- a/cpukit/score/include/rtems/score/rbtree.h
+++ b/cpukit/score/include/rtems/score/rbtree.h
@@ -21,6 +21,8 @@
 /**
  *  @defgroup ScoreRBTree Red-Black Tree Handler
  *
+ *  @ingroup Score
+ *
  *  The Red-Black Tree Handler is used to manage sets of entities.  This handler
  *  provides two data structures.  The rbtree Node data structure is included
  *  as the first part of every data structure that will be placed on
diff --git a/cpukit/score/include/rtems/score/scheduler.h b/cpukit/score/include/rtems/score/scheduler.h
index 2c99a3d7f5..26ccdc9a6a 100644
--- a/cpukit/score/include/rtems/score/scheduler.h
+++ b/cpukit/score/include/rtems/score/scheduler.h
@@ -31,6 +31,8 @@ extern "C" {
 /**
  *  @defgroup ScoreScheduler Scheduler Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality related to managing sets of threads
  *  that are ready for execution.
  */
diff --git a/cpukit/score/include/rtems/score/smp.h b/cpukit/score/include/rtems/score/smp.h
index 727a139e72..d53b06fecf 100644
--- a/cpukit/score/include/rtems/score/smp.h
+++ b/cpukit/score/include/rtems/score/smp.h
@@ -25,6 +25,8 @@
 /**
  *  @defgroup SuperCore SMP Support
  *
+ *  @ingroup Score
+ *
  *  This defines the interface of the SuperCore support
  *  code for SMP support.
  */
diff --git a/cpukit/score/include/rtems/score/smplock.h b/cpukit/score/include/rtems/score/smplock.h
index 53e1e31a66..9c565863a3 100644
--- a/cpukit/score/include/rtems/score/smplock.h
+++ b/cpukit/score/include/rtems/score/smplock.h
@@ -24,6 +24,8 @@
 /**
  *  @defgroup RTEMS Lock Interface
  *
+ *  @ingroup Score
+ *
  */
 
 /**@{*/
diff --git a/cpukit/score/include/rtems/score/stack.h b/cpukit/score/include/rtems/score/stack.h
index 8f5a0173f3..184e49403a 100644
--- a/cpukit/score/include/rtems/score/stack.h
+++ b/cpukit/score/include/rtems/score/stack.h
@@ -23,6 +23,8 @@
 /**
  *  @defgroup ScoreStack Stack Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which is used in the management
  *  of thread stacks.
  */
diff --git a/cpukit/score/include/rtems/score/states.h b/cpukit/score/include/rtems/score/states.h
index fc56924d8a..2acfd22a34 100644
--- a/cpukit/score/include/rtems/score/states.h
+++ b/cpukit/score/include/rtems/score/states.h
@@ -21,6 +21,8 @@
 /**
  *  @defgroup ScoreStates Thread States Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality which relates to the management of
  *  the state bitmap associated with each thread.
  */
diff --git a/cpukit/score/include/rtems/score/thread.h b/cpukit/score/include/rtems/score/thread.h
index 05ac0370f5..b0f50f8c76 100644
--- a/cpukit/score/include/rtems/score/thread.h
+++ b/cpukit/score/include/rtems/score/thread.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup ScoreThread Thread Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality related to the management of
  *  threads.  This includes the creation, deletion, and scheduling of threads.
  *
diff --git a/cpukit/score/include/rtems/score/threadq.h b/cpukit/score/include/rtems/score/threadq.h
index b999588b7d..e633cffad4 100644
--- a/cpukit/score/include/rtems/score/threadq.h
+++ b/cpukit/score/include/rtems/score/threadq.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup ScoreThreadQ Thread Queue Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality related to managing sets of threads
  *  blocked waiting for resources.
  */
diff --git a/cpukit/score/include/rtems/score/threadsync.h b/cpukit/score/include/rtems/score/threadsync.h
index 9b5e3dee96..7154654f5a 100644
--- a/cpukit/score/include/rtems/score/threadsync.h
+++ b/cpukit/score/include/rtems/score/threadsync.h
@@ -23,6 +23,8 @@
 /**
  *  @defgroup ScoreThreadSync Thread Blocking Operation Synchronization Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality related to the management of
  *  synchronization critical sections during blocking operations.
  */
diff --git a/cpukit/score/include/rtems/score/timespec.h b/cpukit/score/include/rtems/score/timespec.h
index 8198b42dfb..10c76d3247 100644
--- a/cpukit/score/include/rtems/score/timespec.h
+++ b/cpukit/score/include/rtems/score/timespec.h
@@ -21,6 +21,8 @@
 /**
  *  @defgroup Timespec Helpers
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality related to manipulating
  *  POSIX struct timespecs.
  */
diff --git a/cpukit/score/include/rtems/score/timestamp.h b/cpukit/score/include/rtems/score/timestamp.h
index 7afbd1c589..7575006e78 100644
--- a/cpukit/score/include/rtems/score/timestamp.h
+++ b/cpukit/score/include/rtems/score/timestamp.h
@@ -21,6 +21,8 @@
 /**
  *  @defgroup SuperCore Timestamp
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality related to manipulating
  *  SuperCore Timestamps.  SuperCore Timestamps may be used to
  *  represent time of day, uptime, or intervals.
diff --git a/cpukit/score/include/rtems/score/timestamp64.h b/cpukit/score/include/rtems/score/timestamp64.h
index 52a32044af..69ace0a71e 100644
--- a/cpukit/score/include/rtems/score/timestamp64.h
+++ b/cpukit/score/include/rtems/score/timestamp64.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup SuperCore Timestamp64
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality related to manipulating
  *  the 64 bit integer implementation of SuperCore Timestamps.
  */
diff --git a/cpukit/score/include/rtems/score/tod.h b/cpukit/score/include/rtems/score/tod.h
index f677e04429..f92e07000a 100644
--- a/cpukit/score/include/rtems/score/tod.h
+++ b/cpukit/score/include/rtems/score/tod.h
@@ -27,7 +27,11 @@
 extern "C" {
 #endif
 
-/** @defgroup ScoreTODConstants TOD Constants
+/**
+ *  @defgroup ScoreTODConstants TOD Constants
+ *
+ *  @ingroup Score
+ *
  *  The following constants are related to the time of day and are
  *  independent of RTEMS.
  */
@@ -114,6 +118,8 @@ extern "C" {
 /**
  *  @defgroup ScoreTOD Time Of Day (TOD) Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality used to manage time of day.
  */
 /**@{*/
diff --git a/cpukit/score/include/rtems/score/tqdata.h b/cpukit/score/include/rtems/score/tqdata.h
index 1531f7cbd8..3c79730b4a 100644
--- a/cpukit/score/include/rtems/score/tqdata.h
+++ b/cpukit/score/include/rtems/score/tqdata.h
@@ -22,6 +22,8 @@
 /**
  *  @defgroup ScoreThreadQData Thread Queue Handler Data Definition
  *
+ *  @ingroup Score
+ *
  *  This handler defines the data shared between the thread and thread
  *  queue handlers.  Having this handler define these data structure
  *  avoids potentially circular references.
diff --git a/cpukit/score/include/rtems/score/watchdog.h b/cpukit/score/include/rtems/score/watchdog.h
index a731f8b744..ba6de8ec36 100644
--- a/cpukit/score/include/rtems/score/watchdog.h
+++ b/cpukit/score/include/rtems/score/watchdog.h
@@ -23,6 +23,8 @@
 /**
  *  @defgroup ScoreWatchdog Watchdog Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality related to the scheduling of
  *  watchdog functions to be called at specific times in the future.
  *
diff --git a/cpukit/score/include/rtems/score/wkspace.h b/cpukit/score/include/rtems/score/wkspace.h
index f4aa66bf51..89b7c6dfc5 100644
--- a/cpukit/score/include/rtems/score/wkspace.h
+++ b/cpukit/score/include/rtems/score/wkspace.h
@@ -23,6 +23,8 @@
 /**
  *  @defgroup ScoreWorkspace Workspace Handler
  *
+ *  @ingroup Score
+ *
  *  This handler encapsulates functionality related to the management of
  *  the RTEMS Executive Workspace.
  */