#987384 by h_peter, jhodgdon: Fixed Topics/groups in D7 need cleanup

5 files changed, 37 insertions, 7 deletions

diff --git a/includes/ajax.inc b/includes/ajax.inc
index a119e1770..0f652eff8 100644
--- a/includes/ajax.inc
+++ b/includes/ajax.inc
@@ -9,6 +9,8 @@
 /**
  * @defgroup ajax AJAX framework
  * @{
+ * Functions for Drupal's AJAX framework.
+ *
  * Drupal's AJAX framework is used to dynamically update parts of a page's HTML
  * based on data from the server. Upon a specified event, such as a button
  * click, a callback function is triggered which performs server-side logic and
@@ -696,6 +698,10 @@ function ajax_pre_render_element($element) {
 /**
  * @defgroup ajax_commands AJAX framework commands
  * @{
+ * Functions to create various AJAX commands.
+ *
+ * These functions can be used to create arrays for use with the
+ * ajax_render() function.
  */
 
 /**
diff --git a/includes/image.inc b/includes/image.inc
index 9eb813dc1..28d63be77 100644
--- a/includes/image.inc
+++ b/includes/image.inc
@@ -9,6 +9,8 @@
 /**
  * @defgroup image Image toolkits
  * @{
+ * Functions for image file manipulations.
+ *
  * Drupal's image toolkits provide an abstraction layer for common image file
  * manipulations like scaling, cropping, and rotating. The abstraction frees
  * module authors from the need to support multiple image libraries, and it
diff --git a/includes/locale.inc b/includes/locale.inc
index b36bcd9e9..0a7eed2b8 100644
--- a/includes/locale.inc
+++ b/includes/locale.inc
@@ -70,6 +70,10 @@ define('LOCALE_LANGUAGE_NEGOTIATION_URL_DOMAIN', 1);
 /**
  * @defgroup locale-languages-negotiation Language negotiation options
  * @{
+ * Functions for language negotiation.
+ *
+ * There are functions that provide the ability to identify the
+ * language. This behavior can be controlled by various options.
  */
 
 /**
@@ -422,6 +426,9 @@ function locale_string_is_safe($string) {
 /**
  * @defgroup locale-api-add Language addition API.
  * @{
+ * Add a language.
+ *
+ * The language addition API is used to create languages and store them.
  */
 
 /**
@@ -498,8 +505,12 @@ function locale_add_language($langcode, $name = NULL, $native = NULL, $direction
  */
 
 /**
- * @defgroup locale-api-import Translation import API.
+ * @defgroup locale-api-import-export Translation import/export API.
  * @{
+ * Functions to import and export translations.
+ *
+ * These functions provide the ability to import translations from
+ * external files and to export translations and translation templates.
  */
 
 /**
@@ -1274,7 +1285,7 @@ function _locale_import_parse_quoted($string) {
   }
 }
 /**
- * @} End of "locale-api-import"
+ * @} End of "locale-api-import-export"
  */
 
 /**
@@ -1347,7 +1358,7 @@ function _locale_parse_js_file($filepath) {
 }
 
 /**
- * @defgroup locale-api-export Translation (template) export API.
+ * @addtogroup locale-api-import-export
  * @{
  */
 
@@ -1584,12 +1595,16 @@ function _locale_export_remove_plural($entry) {
   return preg_replace('/(@count)\[[0-9]\]/', '\\1', $entry);
 }
 /**
- * @} End of "locale-api-export"
+ * @} End of "locale-api-import-export"
  */
 
 /**
- * @defgroup locale-api-seek String search functions.
+ * @defgroup locale-api-seek Translation search API.
  * @{
+ * Functions to search in translation files.
+ *
+ * These functions provide the functionality to search for specific
+ * translations.
  */
 
 /**
@@ -1894,6 +1909,7 @@ function _locale_translate_language_list($translation, $limit_language) {
 /**
  * @defgroup locale-api-predefined List of predefined languages
  * @{
+ * API to provide a list of predefined languages.
  */
 
 /**
@@ -1928,6 +1944,10 @@ function _locale_prepare_predefined_list() {
 /**
  * @defgroup locale-autoimport Automatic interface translation import
  * @{
+ * Functions to create batches for importing translations.
+ *
+ * These functions can be used to import translations for installed
+ * modules.
  */
 
 /**
diff --git a/includes/lock.inc b/includes/lock.inc
index f23c49988..6dd4b9352 100644
--- a/includes/lock.inc
+++ b/includes/lock.inc
@@ -7,8 +7,10 @@
  */
 
 /**
- * @defgroup lock Functions to coordinate long-running operations across requests.
+ * @defgroup lock Locking mechanisms
  * @{
+ * Functions to coordinate long-running operations across requests.
+ *
  * In most environments, multiple Drupal page requests (a.k.a. threads or
  * processes) will execute in parallel. This leads to potential conflicts or
  * race conditions when two requests execute the same code at the same time. A
diff --git a/includes/update.inc b/includes/update.inc
index 27fa80a3f..39c4f77c7 100644
--- a/includes/update.inc
+++ b/includes/update.inc
@@ -209,7 +209,7 @@ function update_prepare_d7_bootstrap() {
     db_create_table('registry_file', $schema['registry_file']);
   }
 
-  // Older versions of Drupal 6 do not include the semaphore table, which is 
+  // Older versions of Drupal 6 do not include the semaphore table, which is
   // required to bootstrap, so we add it now so that we can bootstrap and
   // provide a reasonable error message.
   if (!db_table_exists('semaphore')) {