#987384 follow-up by h_peter, jhodgdon: Further clean-ups to group topics.

13 files changed, 22 insertions, 17 deletions

diff --git a/includes/database/schema.inc b/includes/database/schema.inc
index 184d895ff..e57c94bfb 100644
--- a/includes/database/schema.inc
+++ b/includes/database/schema.inc
@@ -11,6 +11,7 @@ require_once dirname(__FILE__) . '/query.inc';
 /**
  * @defgroup schemaapi Schema API
  * @{
+ * API to handle database schemas.
  *
  * A Drupal schema definition is an array structure representing one or
  * more tables and their related keys and indexes. A schema is defined by
diff --git a/includes/form.inc b/includes/form.inc
index 042986276..b644343b5 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -3986,6 +3986,8 @@ function _form_set_class(&$element, $class = array()) {
 /**
  * @defgroup batch Batch operations
  * @{
+ * Create and process batch operations.
+ *
  * Functions allowing forms processing to be spread out over several page
  * requests, thus ensuring that the processing does not get interrupted
  * because of a PHP timeout, while allowing the user to receive feedback
diff --git a/includes/locale.inc b/includes/locale.inc
index 0a7eed2b8..d6db7c17c 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -424,7 +424,7 @@ function locale_string_is_safe($string) {
 }
 
 /**
- * @defgroup locale-api-add Language addition API.
+ * @defgroup locale-api-add Language addition API
  * @{
  * Add a language.
  *
@@ -1599,7 +1599,7 @@ function _locale_export_remove_plural($entry) {
  */
 
 /**
- * @defgroup locale-api-seek Translation search API.
+ * @defgroup locale-api-seek Translation search API
  * @{
  * Functions to search in translation files.
  *
diff --git a/includes/menu.inc b/includes/menu.inc
index e65435237..1a54f1594 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -125,8 +125,10 @@ define('MENU_IS_LOCAL_ACTION', 0x0100);
 /**
  * @defgroup menu_item_types Menu item types
  * @{
+ * Definitions for various menu types.
+ *
  * Menu item definitions provide one of these constants, which are shortcuts for
- * combinations of the above flags.
+ * combinations of @link menu_flags Menu flags @endlink.
  */
 
 /**
@@ -251,7 +253,7 @@ define('MENU_SITE_ONLINE', 5);
 /**
  * @defgroup menu_tree_parameters Menu tree parameters
  * @{
- * Menu tree
+ * Parameters for a menu tree.
  */
 
  /**
diff --git a/includes/pager.inc b/includes/pager.inc
index 69c2759b3..553e279c3 100644
--- a/includes/pager.inc
+++ b/includes/pager.inc
@@ -431,8 +431,9 @@ function theme_pager($variables) {
 /**
  * @defgroup pagerpieces Pager pieces
  * @{
- * Use these pieces to construct your own custom pagers in your theme. Note that
- * you should NOT modify this file to customize your pager.
+ * Use these pieces to construct your own custom pagers in your theme.
+ *
+ * Note that you should NOT modify this file to customize your pager.
  */
 
 /**
diff --git a/includes/update.inc b/includes/update.inc
index 39c4f77c7..0019df671 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -1448,7 +1448,7 @@ function update_retrieve_dependencies() {
 }
 
 /**
- * @defgroup update-api-6.x-to-7.x Update versions of API functions.
+ * @defgroup update-api-6.x-to-7.x Update versions of API functions
  * @{
  * Functions similar to normal API function but not firing hooks.
  *
diff --git a/modules/field/field.multilingual.inc b/modules/field/field.multilingual.inc
index c8ef28e25..10db9546a 100644
--- a/modules/field/field.multilingual.inc
+++ b/modules/field/field.multilingual.inc
@@ -7,7 +7,7 @@
  */
 
 /**
- * @defgroup field_language Field language API
+ * @defgroup field_language Field Language API
  * @{
  * Handling of multilingual fields.
  *
diff --git a/modules/locale/locale.admin.inc b/modules/locale/locale.admin.inc
index 118e9212c..8365cd733 100644
--- a/modules/locale/locale.admin.inc
+++ b/modules/locale/locale.admin.inc
@@ -743,7 +743,7 @@ function locale_language_providers_session_form($form, &$form_state) {
  */
 
 /**
- * @defgroup locale-translate-administration-screens Translation administration screens.
+ * @defgroup locale-translate-administration-screens Translation administration screens
  * @{
  * Screens for translation administration.
  *
diff --git a/modules/node/node.api.php b/modules/node/node.api.php
index 6e215e33a..2e60cea09 100644
--- a/modules/node/node.api.php
+++ b/modules/node/node.api.php
@@ -9,9 +9,7 @@
 /**
  * @defgroup node_api_hooks Node API Hooks
  * @{
- * The Node API allows modules to define content types, to modify content
- * types created in the user interface, and to modify content types created by
- * other modules.
+ * Functions to define and modify content types.
  *
  * Each content type is maintained by a primary module, which is either
  * node.module (for content types created in the user interface) or the
diff --git a/modules/node/node.module b/modules/node/node.module
index 9ca4f470b..399fa7ea3 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -3491,7 +3491,7 @@ function _node_access_rebuild_batch_finished($success, $results, $operations) {
 
 
 /**
- * @defgroup node_content Hook implementations for user-created content types.
+ * @defgroup node_content Hook implementations for user-created content types
  * @{
  * Functions that implement hooks for user-created content types.
  */
diff --git a/modules/system/system.queue.inc b/modules/system/system.queue.inc
index 283c6b6f9..b6cf96e07 100644
--- a/modules/system/system.queue.inc
+++ b/modules/system/system.queue.inc
@@ -9,6 +9,8 @@
 /**
  * @defgroup queue Queue operations
  * @{
+ * Queue items to allow later processing.
+ *
  * The queue system allows placing items in a queue and processing them later.
  * The system tries to ensure that only one consumer can process an item.
  *
diff --git a/modules/system/theme.api.php b/modules/system/theme.api.php
index 5bad49a75..2284a7c76 100644
--- a/modules/system/theme.api.php
+++ b/modules/system/theme.api.php
@@ -4,8 +4,7 @@
 /**
  * @defgroup themeable Default theme implementations
  * @{
- * Functions and templates that present output to the user, and can be
- * implemented by themes.
+ * Functions and templates for the user interface to be implemented by themes.
  *
  * Drupal's presentation layer is a pluggable system known as the theme
  * layer. Each theme can take control over most of Drupal's output, and
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 459affa7e..9a1228a37 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1621,7 +1621,7 @@ function taxonomy_rdf_mapping() {
 }
 
 /**
- * @defgroup taxonomy indexing Taxonomy functions maintaining {taxonomy_index}.
+ * @defgroup taxonomy_index Taxonomy indexing
  * @{
  * Functions to maintain taxonomy indexing.
  *
@@ -1725,5 +1725,5 @@ function taxonomy_taxonomy_term_delete($term) {
 }
 
 /**
- * @} End of "defgroup taxonomy indexing"
+ * @} End of "defgroup taxonomy_index"
  */