Index: includes/batch.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/batch.inc,v
retrieving revision 1.14
diff -u -w -B -F^f -r1.14 batch.inc
--- includes/batch.inc	20 Dec 2007 11:57:20 -0000	1.14
+++ includes/batch.inc	10 Feb 2008 18:17:14 -0000
@@ -2,7 +2,8 @@
 // $Id: batch.inc,v 1.14 2007/12/20 11:57:20 goba Exp $
 
 /**
- * @file Batch processing API for processes to run in multiple HTTP requests.
+ * @file
+ * Batch processing API for processes to run in multiple HTTP requests.
  */
 
 /**
Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.174
diff -u -w -B -F^f -r1.174 locale.inc
--- includes/locale.inc	9 Jan 2008 21:36:13 -0000	1.174
+++ includes/locale.inc	10 Feb 2008 18:17:15 -0000
@@ -21,7 +21,7 @@
 define('LOCALE_IMPORT_KEEP', 1);
 
 /**
- * @defgroup locale-language-overview Language overview functionality
+ * @name Language overview functionality
  * @{
  */
 
@@ -130,11 +130,11 @@ function locale_languages_overview_form_
   return;
 }
 /**
- * @} End of "locale-language-overview"
+ * @} End of "Language overview functionality"
  */
 
 /**
- * @defgroup locale-language-add-edit Language addition and editing functionality
+ * @name Language addition and editing functionality
  * @{
  */
 
@@ -368,11 +368,11 @@ function locale_languages_edit_form_subm
   return;
 }
 /**
- * @} End of "locale-language-add-edit"
+ * @} End of "Language addition and editing functionality"
  */
 
 /**
- * @defgroup locale-language-delete Language deletion functionality
+ * @name Language deletion functionality
  * @{
  */
 
@@ -430,11 +430,11 @@ function locale_languages_delete_form_su
   return;
 }
 /**
- * @} End of "locale-language-add-edit"
+ * @} End of "Language deletion functionality"
  */
 
 /**
- * @defgroup locale-languages-negotiation Language negotiation options screen
+ * @name Language negotiation options screen
  * @{
  */
 
@@ -470,11 +470,11 @@ function locale_languages_configure_form
   return;
 }
 /**
- * @} End of "locale-languages-negotiation"
+ * @} End of "Language negotiation options screen"
  */
 
 /**
- * @defgroup locale-translate-overview Translation overview screen.
+ * @name Translation overview screen
  * @{
  */
 
@@ -514,11 +514,11 @@ function locale_translate_overview_scree
   return theme('table', $headers, $rows);
 }
 /**
- * @} End of "locale-translate-overview"
+ * @} End of "Translation overview screen"
  */
 
 /**
- * @defgroup locale-translate-seek Translation search screen.
+ * @name Translation search screen
  * @{
  */
 
@@ -576,11 +576,11 @@ function locale_translate_seek_form() {
   return $form;
 }
 /**
- * @} End of "locale-translate-seek"
+ * @} End of "Translation search screen"
  */
 
 /**
- * @defgroup locale-translate-import Translation import screen.
+ * @name Translation import screen
  * @{
  */
 
@@ -671,11 +671,11 @@ function locale_translate_import_form_su
   return;
 }
 /**
- * @} End of "locale-translate-import"
+ * @} End of "Translation import screen"
  */
 
 /**
- * @defgroup locale-translate-export Translation export screen.
+ * @name Translation export screen
  * @{
  */
 
@@ -755,11 +755,11 @@ function locale_translate_export_po_form
   _locale_export_po($language, _locale_export_po_generate($language, _locale_export_get_strings($language, $form_state['values']['group'])));
 }
 /**
- * @} End of "locale-translate-export"
+ * @} End of "Translation export screen"
  */
 
 /**
- * @defgroup locale-translate-edit Translation text editing
+ * @name Translation text editing
  * @{
  */
 
@@ -859,11 +859,11 @@ function locale_translate_edit_form_subm
   return;
 }
 /**
- * @} End of "locale-translate-edit"
+ * @} End of "Translation text editing"
  */
 
 /**
- * @defgroup locale-translate-delete Translation delete interface.
+ * @name Translation delete interface
  * @{
  */
 
@@ -880,11 +880,11 @@ function locale_translate_delete($lid) {
   drupal_goto('admin/build/translate/search');
 }
 /**
- * @} End of "locale-translate-delete"
+ * @} End of "Translation delete interface"
  */
 
 /**
- * @defgroup locale-api-add Language addition API.
+ * @name Language addition API
  * @{
  */
 
@@ -942,11 +942,11 @@ function locale_add_language($langcode, 
   watchdog('locale', 'The %language language (%code) has been created.', array('%language' => $name, '%code' => $langcode));
 }
 /**
- * @} End of "locale-api-add"
+ * @} End of "Language addition API"
  */
 
 /**
- * @defgroup locale-api-import Translation import API.
+ * @name Translation import API
  * @{
  */
 
@@ -1608,7 +1608,7 @@ function _locale_import_parse_quoted($st
   }
 }
 /**
- * @} End of "locale-api-import"
+ * @} End of "Translation import API"
  */
 
 /**
@@ -1665,7 +1665,7 @@ function _locale_parse_js_file($filepath
 }
 
 /**
- * @defgroup locale-api-export Translation (template) export API.
+ * @name Translation (template) export API
  * @{
  */
 
@@ -1897,11 +1897,11 @@ function _locale_export_remove_plural($e
   return preg_replace('/(@count)\[[0-9]\]/', '\\1', $entry);
 }
 /**
- * @} End of "locale-api-export"
+ * @} End of "Translation (template) export API"
  */
 
 /**
- * @defgroup locale-api-seek String search functions.
+ * @name String search functions
  * @{
  */
 
@@ -2194,11 +2194,11 @@ function _locale_translate_language_list
   return $output;
 }
 /**
- * @} End of "locale-api-seek"
+ * @} End of "String search functions"
  */
 
 /**
- * @defgroup locale-api-predefined List of predefined languages
+ * @name List of predefined languages
  * @{
  */
 
@@ -2414,11 +2414,11 @@ function _locale_get_predefined_list() {
   );
 }
 /**
- * @} End of "locale-api-languages-predefined"
+ * @} End of "List of predefined languages"
  */
 
 /**
- * @defgroup locale-autoimport Automatic interface translation import
+ * @name Automatic interface translation import
  * @{
  */
 
@@ -2566,5 +2566,5 @@ function _locale_batch_language_finished
 }
 
 /**
- * @} End of "locale-autoimport"
+ * @} End of "Automatic interface translation import"
  */
Index: modules/blogapi/blogapi.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.install,v
retrieving revision 1.1
diff -u -w -B -F^f -r1.1 blogapi.install
--- modules/blogapi/blogapi.install	9 Jan 2008 09:51:34 -0000	1.1
+++ modules/blogapi/blogapi.install	10 Feb 2008 18:17:16 -0000
@@ -2,7 +2,7 @@
 // $Id: blogapi.install,v 1.1 2008/01/09 09:51:34 goba Exp $
 
 /**
- * @defgroup updates-5.x-to-6.x Blog API updates from 5.x to 6.x
+ * @addtogroup updates_5x_to_6x
  * @{
  */
 
@@ -15,6 +15,6 @@ function blogapi_update_6000() {
 }
 
 /**
- * @} End of "defgroup updates-5.x-to-6.x"
+ * @} End of "addtogroup updates_5x_to_6x"
  * The next series of updates should start at 7000.
  */
Index: modules/locale/locale.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/locale/locale.install,v
retrieving revision 1.27
diff -u -w -B -F^f -r1.27 locale.install
--- modules/locale/locale.install	10 Jan 2008 14:35:24 -0000	1.27
+++ modules/locale/locale.install	10 Feb 2008 18:17:18 -0000
@@ -16,7 +16,7 @@ function locale_install() {
 }
 
 /**
- * @defgroup updates-5.x-to-6.x Locale updates from 5.x to 6.x
+ * @addtogroup updates_5x_to_6x
  * @{
  */
 
@@ -202,7 +202,7 @@ function locale_update_6005() {
 }
 
 /**
- * @} End of "defgroup updates-5.x-to-6.x"
+ * @} End of "addtogroup updates_5x_to_6x"
  */
 
 /**
Index: modules/system/system.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.install,v
retrieving revision 1.238.2.1
diff -u -w -B -F^f -r1.238.2.1 system.install
--- modules/system/system.install	8 Feb 2008 17:07:55 -0000	1.238.2.1
+++ modules/system/system.install	10 Feb 2008 18:17:22 -0000
@@ -1098,7 +1098,7 @@ function system_update_last_removed() {
 }
 
 /**
- * @defgroup updates-5.x-extra Extra system updates for 5.x
+ * @defgroup updates_5x_extra Extra updates for 5.x
  * @{
  */
 
@@ -1114,11 +1114,11 @@ function system_update_1022() {
 }
 
 /**
- * @} End of "defgroup updates-5.x-extra"
+ * @} End of "defgroup updates_5x_extra"
  */
 
 /**
- * @defgroup updates-5.x-to-6.x System updates from 5.x to 6.x
+ * @defgroup updates_5x_to_6x Updates from 5.x to 6.x
  * @{
  */
 
@@ -2512,6 +2512,7 @@ function system_update_6047() {
 }
 
 /**
- * @} End of "defgroup updates-5.x-to-6.x"
+ * @} End of "defgroup updates_5x_to_6x"
+ * 
  * The next series of updates should start at 7000.
  */