From 467a825239bdd34a84e18064cb6c8ac8ecb7bb1f Mon Sep 17 00:00:00 2001
From: Jennifer Hodgdon <yahgrp@poplarware.com>
Date: Thu, 17 May 2012 05:58:49 -0700
Subject: [PATCH] =?UTF-8?q?Issue=20#1358944=20by=20wulff,=20D=C3=A9sir?=
=?UTF-8?q?=C3=A9:=20Fix=20ingroup/addtogroup=20syntax?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
core/includes/bootstrap.inc | 4 ++--
core/includes/common.inc | 2 +-
core/includes/database.inc | 4 ++--
core/includes/gettext.inc | 2 +-
core/includes/menu.inc | 10 +++++-----
core/includes/pager.inc | 2 +-
core/includes/schema.inc | 4 ++--
core/includes/theme.inc | 6 +++---
core/includes/update.inc | 2 +-
.../Core/Database/Driver/mysql/Connection.php | 4 ++--
.../Core/Database/Driver/mysql/Schema.php | 4 ++--
.../Core/Database/Driver/pgsql/Connection.php | 4 ++--
.../Core/Database/Driver/pgsql/Schema.php | 4 ++--
.../Core/Database/Driver/pgsql/Select.php | 4 ++--
core/modules/block/block.install | 2 +-
core/modules/comment/comment.install | 2 +-
core/modules/field/field.api.php | 20 +++++++++----------
core/modules/field/field.attach.inc | 4 ++--
core/modules/field/field.info.inc | 2 +-
core/modules/field/field.module | 2 +-
core/modules/field_ui/field_ui.api.php | 2 +-
core/modules/filter/filter.module | 2 +-
core/modules/locale/locale.install | 2 +-
core/modules/node/node.install | 2 +-
core/modules/openid/openid.install | 2 +-
core/modules/system/image.gd.inc | 4 ++--
core/modules/system/system.install | 2 +-
core/modules/taxonomy/taxonomy.module | 2 +-
core/modules/user/user.install | 2 +-
29 files changed, 54 insertions(+), 54 deletions(-)
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index f65ab4c666eb..42de880b7f8b 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -2814,7 +2814,7 @@ function ip_address() {
}
/**
- * @ingroup registry
+ * @addtogroup registry
* @{
*/
@@ -3049,7 +3049,7 @@ function registry_update() {
}
/**
- * @} End of "ingroup registry".
+ * @} End of "addtogroup registry".
*/
/**
diff --git a/core/includes/common.inc b/core/includes/common.inc
index fea16e1a1924..19e0d59bc667 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -1020,7 +1020,7 @@ function drupal_http_request($url, array $options = array()) {
return $result;
}
/**
- * @} End of "HTTP handling".
+ * @} End of "defgroup http_handling".
*/
/**
diff --git a/core/includes/database.inc b/core/includes/database.inc
index c2df94988ffd..92d4119f70d0 100644
--- a/core/includes/database.inc
+++ b/core/includes/database.inc
@@ -574,7 +574,7 @@ function db_condition($conjunction) {
/**
- * @ingroup schemaapi
+ * @addtogroup schemaapi
* @{
*/
@@ -891,7 +891,7 @@ function db_change_field($table, $field, $field_new, $spec, $keys_new = array())
}
/**
- * @} End of "ingroup schemaapi".
+ * @} End of "addtogroup schemaapi".
*/
/**
diff --git a/core/includes/gettext.inc b/core/includes/gettext.inc
index 2355157cb889..4e3b22132cf8 100644
--- a/core/includes/gettext.inc
+++ b/core/includes/gettext.inc
@@ -1127,5 +1127,5 @@ function _locale_export_wrap($str, $len) {
}
/**
- * @} End of "locale-api-import-export"
+ * @} End of "defgroup locale-api-import-export".
*/
diff --git a/core/includes/menu.inc b/core/includes/menu.inc
index dc70185f4b91..0c18a60b4ef5 100644
--- a/core/includes/menu.inc
+++ b/core/includes/menu.inc
@@ -121,7 +121,7 @@
const MENU_IS_LOCAL_ACTION = 0x0100;
/**
- * @} End of "Menu flags".
+ * @} End of "defgroup menu_flags".
*/
/**
@@ -186,7 +186,7 @@
define('MENU_LOCAL_ACTION', MENU_IS_LOCAL_TASK | MENU_IS_LOCAL_ACTION | MENU_VISIBLE_IN_BREADCRUMB);
/**
- * @} End of "Menu item types".
+ * @} End of "defgroup menu_item_types".
*/
/**
@@ -214,7 +214,7 @@
const MENU_CONTEXT_INLINE = 0x0002;
/**
- * @} End of "Menu context types".
+ * @} End of "defgroup menu_context_types".
*/
/**
@@ -244,7 +244,7 @@
const MENU_SITE_ONLINE = 5;
/**
- * @} End of "Menu status codes".
+ * @} End of "defgroup menu_status_codes".
*/
/**
@@ -266,7 +266,7 @@
/**
- * @} End of "Menu tree parameters".
+ * @} End of "defgroup menu_tree_parameters".
*/
/**
diff --git a/core/includes/pager.inc b/core/includes/pager.inc
index 201c5ad6f213..458302380faa 100644
--- a/core/includes/pager.inc
+++ b/core/includes/pager.inc
@@ -643,7 +643,7 @@ function theme_pager_link($variables) {
}
/**
- * @} End of "Pager pieces".
+ * @} End of "defgroup pagerpieces".
*/
/**
diff --git a/core/includes/schema.inc b/core/includes/schema.inc
index f698189993dc..c11068ff3647 100644
--- a/core/includes/schema.inc
+++ b/core/includes/schema.inc
@@ -9,7 +9,7 @@
use Drupal\Core\Utility\SchemaCache;
/**
- * @ingroup schemaapi
+ * @addtogroup schemaapi
* @{
*/
@@ -518,5 +518,5 @@ function drupal_write_record($table, &$record, $primary_keys = array()) {
}
/**
- * @} End of "ingroup schemaapi".
+ * @} End of "addtogroup schemaapi".
*/
diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 2a88969f8c80..7d638f669bda 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -31,7 +31,7 @@
const MARK_UPDATED = 2;
/**
- * @} End of "Content markers".
+ * @} End of "defgroup content_flags".
*/
/**
@@ -1530,7 +1530,7 @@ function theme_disable($theme_list) {
}
/**
- * @ingroup themeable
+ * @addtogroup themeable
* @{
*/
@@ -2323,7 +2323,7 @@ function theme_indentation($variables) {
}
/**
- * @} End of "ingroup themeable".
+ * @} End of "addtogroup themeable".
*/
/**
diff --git a/core/includes/update.inc b/core/includes/update.inc
index fb6f450894b4..18ce17196d39 100644
--- a/core/includes/update.inc
+++ b/core/includes/update.inc
@@ -949,5 +949,5 @@ function update_variables_to_config($config_name, array $variable_map = array())
*/
/**
- * @} End of "defgroup update-api-7.x-to-8.x"
+ * @} End of "defgroup update-api-7.x-to-8.x".
*/
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
index 0e7ab721ef31..8668c0f1a937 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Connection.php
@@ -15,7 +15,7 @@
use PDOException;
/**
- * @ingroup database
+ * @addtogroup database
* @{
*/
@@ -207,5 +207,5 @@ protected function popCommittableTransactions() {
/**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
*/
diff --git a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
index 2961aebffc3d..c8b417135822 100644
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
@@ -16,7 +16,7 @@
use Exception;
/**
- * @ingroup schemaapi
+ * @addtogroup schemaapi
* @{
*/
@@ -541,5 +541,5 @@ public function fieldExists($table, $column) {
}
/**
- * @} End of "ingroup schemaapi".
+ * @} End of "addtogroup schemaapi".
*/
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
index a8bdaa917a54..b3f6d6444236 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
@@ -15,7 +15,7 @@
use PDOException;
/**
- * @ingroup database
+ * @addtogroup database
* @{
*/
@@ -211,5 +211,5 @@ public function nextId($existing = 0) {
}
/**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
*/
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index 7206e178dba0..6ce4a0af84d2 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -16,7 +16,7 @@
use Exception;
/**
- * @ingroup schemaapi
+ * @addtogroup schemaapi
* @{
*/
@@ -627,5 +627,5 @@ public function getComment($table, $column = NULL) {
}
/**
- * @} End of "ingroup database".
+ * @} End of "addtogroup schemaapi".
*/
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
index a9226b26dbcf..c2a5a05eb76a 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Select.php
@@ -10,7 +10,7 @@
use Drupal\Core\Database\Query\Select as QuerySelect;
/**
- * @ingroup database
+ * @addtogroup database
* @{
*/
@@ -107,5 +107,5 @@ public function orderBy($field, $direction = 'ASC') {
}
/**
- * @} End of "ingroup database".
+ * @} End of "addtogroup database".
*/
diff --git a/core/modules/block/block.install b/core/modules/block/block.install
index 1b450cd37d8e..632e10687e32 100644
--- a/core/modules/block/block.install
+++ b/core/modules/block/block.install
@@ -267,6 +267,6 @@ function block_update_8001() {
}
/**
- * @} End of "addtogroup updates-7.x-to-8.x"
+ * @} End of "addtogroup updates-7.x-to-8.x".
* The next series of updates should start at 9000.
*/
diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install
index 6e96192cc3ee..4b3c9fc0b24e 100644
--- a/core/modules/comment/comment.install
+++ b/core/modules/comment/comment.install
@@ -282,6 +282,6 @@ function comment_update_8000() {
}
/**
- * @} End of "addtogroup updates-7.x-to-8.x"
+ * @} End of "addtogroup updates-7.x-to-8.x".
* The next series of updates should start at 9000.
*/
diff --git a/core/modules/field/field.api.php b/core/modules/field/field.api.php
index 7fce12506027..288fd66f9b1e 100644
--- a/core/modules/field/field.api.php
+++ b/core/modules/field/field.api.php
@@ -678,7 +678,7 @@ function hook_field_is_empty($item, $field) {
}
/**
- * @} End of "defgroup field_types"
+ * @} End of "defgroup field_types".
*/
/**
@@ -960,7 +960,7 @@ function hook_field_widget_error($element, $error, $form, &$form_state) {
/**
- * @} End of "defgroup field_widget"
+ * @} End of "defgroup field_widget".
*/
@@ -1199,11 +1199,11 @@ function hook_field_formatter_view($entity_type, $entity, $field, $instance, $la
}
/**
- * @} End of "defgroup field_formatter"
+ * @} End of "defgroup field_formatter".
*/
/**
- * @ingroup field_attach
+ * @addtogroup field_attach
* @{
*/
@@ -1555,11 +1555,11 @@ function hook_field_attach_delete_bundle($entity_type, $bundle, $instances) {
}
/**
- * @} End of "defgroup field_attach"
+ * @} End of "addtogroup field_attach".
*/
/**
- * @ingroup field_storage
+ * @addtogroup field_storage
* @{
*/
@@ -2392,11 +2392,11 @@ function hook_field_widget_properties_ENTITY_TYPE_alter(&$widget, $context) {
}
/**
- * @} End of "ingroup field_storage"
+ * @} End of "addtogroup field_storage".
*/
/**
- * @ingroup field_crud
+ * @addtogroup field_crud
* @{
*/
@@ -2646,7 +2646,7 @@ function hook_field_storage_purge($entity_type, $entity, $field, $instance) {
}
/**
- * @} End of "ingroup field_crud"
+ * @} End of "addtogroup field_crud".
*/
/**
@@ -2677,5 +2677,5 @@ function hook_field_access($op, $field, $entity_type, $entity, $account) {
}
/**
- * @} End of "addtogroup hooks"
+ * @} End of "addtogroup hooks".
*/
diff --git a/core/modules/field/field.attach.inc b/core/modules/field/field.attach.inc
index cf597f0d9620..e4b28a9ec486 100644
--- a/core/modules/field/field.attach.inc
+++ b/core/modules/field/field.attach.inc
@@ -43,7 +43,7 @@
const FIELD_STORAGE_INSERT = 'insert';
/**
- * @} End of "defgroup field_storage"
+ * @} End of "defgroup field_storage".
*/
/**
@@ -1344,5 +1344,5 @@ function field_attach_delete_bundle($entity_type, $bundle) {
/**
- * @} End of "defgroup field_attach"
+ * @} End of "defgroup field_attach".
*/
diff --git a/core/modules/field/field.info.inc b/core/modules/field/field.info.inc
index 78bc62e34b8b..7ce5b98411a0 100644
--- a/core/modules/field/field.info.inc
+++ b/core/modules/field/field.info.inc
@@ -901,5 +901,5 @@ function field_info_storage_settings($type) {
}
/**
- * @} End of "defgroup field_info"
+ * @} End of "defgroup field_info".
*/
diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 6fc85ad12650..d89d21f04092 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -1097,7 +1097,7 @@ function template_process_field(&$variables, $hook) {
}
}
/**
- * @} End of "defgroup field"
+ * @} End of "defgroup field".
*/
/**
diff --git a/core/modules/field_ui/field_ui.api.php b/core/modules/field_ui/field_ui.api.php
index ff85b5d957a5..80cbe786ba2b 100644
--- a/core/modules/field_ui/field_ui.api.php
+++ b/core/modules/field_ui/field_ui.api.php
@@ -199,5 +199,5 @@ function hook_field_formatter_settings_summary($field, $instance, $view_mode) {
}
/**
- * @} End of "addtogroup field_types"
+ * @} End of "addtogroup field_types".
*/
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index 5d5589eb97bb..94d8a0375c03 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -1693,5 +1693,5 @@ function _filter_html_escape_tips($filter, $format, $long = FALSE) {
}
/**
- * @} End of "Standard filters".
+ * @} End of "defgroup standard_filters".
*/
diff --git a/core/modules/locale/locale.install b/core/modules/locale/locale.install
index d740c671ccdc..b29bdeea54c9 100644
--- a/core/modules/locale/locale.install
+++ b/core/modules/locale/locale.install
@@ -542,6 +542,6 @@ function locale_update_8009() {
}
/**
- * @} End of "addtogroup updates-7.x-to-8.x"
+ * @} End of "addtogroup updates-7.x-to-8.x".
* The next series of updates should start at 9000.
*/
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index b2616ab6b87b..ee8905909f77 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -558,6 +558,6 @@ function node_update_8002() {
}
/**
- * @} End of "addtogroup updates-7.x-to-8.x"
+ * @} End of "addtogroup updates-7.x-to-8.x".
* The next series of updates should start at 9000.
*/
diff --git a/core/modules/openid/openid.install b/core/modules/openid/openid.install
index 830f9905f176..d348043f7a3c 100644
--- a/core/modules/openid/openid.install
+++ b/core/modules/openid/openid.install
@@ -156,5 +156,5 @@ function openid_update_6000() {
}
/**
- * @} End of "addtogroup updates-6.x-to-7.x"
+ * @} End of "addtogroup updates-6.x-to-7.x".
*/
diff --git a/core/modules/system/image.gd.inc b/core/modules/system/image.gd.inc
index b8dd8221b7c1..6f47195e8a38 100644
--- a/core/modules/system/image.gd.inc
+++ b/core/modules/system/image.gd.inc
@@ -6,7 +6,7 @@
*/
/**
- * @ingroup image
+ * @addtogroup image
* @{
*/
@@ -351,5 +351,5 @@ function image_gd_get_info(stdClass $image) {
}
/**
- * @} End of "ingroup image".
+ * @} End of "addtogroup image".
*/
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 8958f317ab04..1e93e163fb4f 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -1866,6 +1866,6 @@ function system_update_8009() {
}
/**
- * @} End of "defgroup updates-7.x-to-8.x"
+ * @} End of "defgroup updates-7.x-to-8.x".
* The next series of updates should start at 9000.
*/
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index 755689c479e8..7fdb8a2cb10e 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -1659,5 +1659,5 @@ function taxonomy_taxonomy_term_delete(Term $term) {
}
/**
- * @} End of "defgroup taxonomy_index"
+ * @} End of "defgroup taxonomy_index".
*/
diff --git a/core/modules/user/user.install b/core/modules/user/user.install
index ce11aafefbae..b1ff2729b2de 100644
--- a/core/modules/user/user.install
+++ b/core/modules/user/user.install
@@ -399,5 +399,5 @@ function user_update_8001() {
}
/**
- * @} End of "addtogroup updates-7.x-to-8.x"
+ * @} End of "addtogroup updates-7.x-to-8.x".
*/
--
GitLab