Index: arch/ia32/include/interrupt.h
===================================================================
--- arch/ia32/include/interrupt.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/ia32/include/interrupt.h	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup ia32interrupt
+/** @addtogroup ia32interrupt
  * @{
  */
@@ -125,5 +125,5 @@
 #endif
 
- /** @}
+/** @}
  */
 
Index: arch/ia32/src/interrupt.c
===================================================================
--- arch/ia32/src/interrupt.c	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/ia32/src/interrupt.c	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup ia32interrupt ia32
+/** @addtogroup ia32interrupt ia32
  * @ingroup interrupt
  * @{
@@ -207,5 +207,5 @@
 }
 
- /** @}
- */
-
+/** @}
+ */
+
Index: arch/ia64/src/interrupt.c
===================================================================
--- arch/ia64/src/interrupt.c	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/ia64/src/interrupt.c	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -28,5 +28,5 @@
  */
 
- /** @addtogroup ia64interrupt ia64
+/** @addtogroup ia64interrupt ia64
  * @ingroup interrupt
  * @{
@@ -281,5 +281,5 @@
 }
 
- /** @}
- */
-
+/** @}
+ */
+
Index: arch/sparc64/include/trap/exception.h
===================================================================
--- arch/sparc64/include/trap/exception.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/sparc64/include/trap/exception.h	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,8 +27,9 @@
  */
 
- /** @addtogroup sparc64	
+/** @addtogroup sparc64interrupt
  * @{
  */
-/** @file
+/**
+ * @file
  */
 
@@ -50,5 +51,5 @@
 #endif
 
- /** @}
+/** @}
  */
 
Index: arch/sparc64/include/trap/interrupt.h
===================================================================
--- arch/sparc64/include/trap/interrupt.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/sparc64/include/trap/interrupt.h	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,12 +27,10 @@
  */
 
- /** @addtogroup sparc64	
+/** @addtogroup sparc64interrupt
  * @{
  */
-/** @file
- */
-
-/**
- * This file contains interrupt vector trap handler.
+/** 
+ * @file
+ * @brief This file contains interrupt vector trap handler.
  */
 
@@ -79,5 +77,5 @@
 #endif
 
- /** @}
+/** @}
  */
 
Index: arch/sparc64/include/trap/mmu.h
===================================================================
--- arch/sparc64/include/trap/mmu.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/sparc64/include/trap/mmu.h	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,12 +27,10 @@
  */
 
- /** @addtogroup sparc64	
+/** @addtogroup sparc64interrupt
  * @{
  */
-/** @file
- */
-
 /**
- * This file contains fast MMU trap handlers.
+ * @file
+ * @brief This file contains fast MMU trap handlers.
  */
 
@@ -76,5 +74,4 @@
 #endif
 
- /** @}
+/** @}
  */
-
Index: arch/sparc64/include/trap/regwin.h
===================================================================
--- arch/sparc64/include/trap/regwin.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/sparc64/include/trap/regwin.h	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,12 +27,10 @@
  */
 
- /** @addtogroup sparc64	
+/** @addtogroup sparc64interrupt
  * @{
  */
-/** @file
- */
-
 /**
- * This file contains register window trap handlers.
+ * @file
+ * @brief This file contains register window trap handlers.
  */
 
@@ -139,5 +137,5 @@
 #endif
 
- /** @}
+/** @}
  */
 
Index: arch/sparc64/include/trap/trap.h
===================================================================
--- arch/sparc64/include/trap/trap.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/sparc64/include/trap/trap.h	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup sparc64	
+/** @addtogroup sparc64interrupt
  * @{
  */
@@ -50,5 +50,5 @@
 #endif
 
- /** @}
+/** @}
  */
 
Index: arch/sparc64/include/trap/trap_table.h
===================================================================
--- arch/sparc64/include/trap/trap_table.h	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/sparc64/include/trap/trap_table.h	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,5 +27,5 @@
  */
 
- /** @addtogroup sparc64	
+/** @addtogroup sparc64interrupt
  * @{
  */
@@ -98,5 +98,5 @@
 #endif
 
- /** @}
+/** @}
  */
 
Index: arch/sparc64/src/trap/exception.c
===================================================================
--- arch/sparc64/src/trap/exception.c	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/sparc64/src/trap/exception.c	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,8 +27,9 @@
  */
 
- /** @addtogroup sparc64	
+/** @addtogroup sparc64interrupt
  * @{
  */
 /** @file
+ *
  */
 
@@ -61,5 +62,5 @@
 }
 
- /** @}
+/** @}
  */
 
Index: arch/sparc64/src/trap/interrupt.c
===================================================================
--- arch/sparc64/src/trap/interrupt.c	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/sparc64/src/trap/interrupt.c	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,8 +27,10 @@
  */
 
- /** @addtogroup sparc64	
+/** @addtogroup sparc64interrupt sparc64
+ * @ingroup interrupt
  * @{
  */
 /** @file
+ *
  */
 
@@ -59,5 +61,5 @@
 }
 
- /** @}
+/** @}
  */
 
Index: arch/sparc64/src/trap/trap.c
===================================================================
--- arch/sparc64/src/trap/trap.c	(revision b45c443eb976adbe668a3f855f749cf0ad3a5b3f)
+++ arch/sparc64/src/trap/trap.c	(revision 3222efdcfad18af55ba1144add774a0135d0b433)
@@ -27,8 +27,9 @@
  */
 
- /** @addtogroup sparc64	
+/** @addtogroup sparc64interrupt
  * @{
  */
 /** @file
+ *
  */
 
@@ -51,5 +52,5 @@
 }
 
- /** @}
+/** @}
  */