diff --git a/.gitignore b/.gitignore
index 5023b0b..5af1a49 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ sites/*/settings*.php
 sites/*/files
 sites/*/private
 
+/nbproject/private/
\ No newline at end of file
diff --git a/modules/aggregator/aggregator.fetcher.inc b/modules/aggregator/aggregator.fetcher.inc
index 0f72877..d552e85 100644
--- a/modules/aggregator/aggregator.fetcher.inc
+++ b/modules/aggregator/aggregator.fetcher.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_aggregator_fetch_info().
+ * @implements hook_aggregator_fetch_info().
  */
 function aggregator_aggregator_fetch_info() {
   return array(
@@ -16,7 +16,7 @@ function aggregator_aggregator_fetch_info() {
 }
 
 /**
- * Implements hook_aggregator_fetch().
+ * @implements hook_aggregator_fetch().
  */
 function aggregator_aggregator_fetch($feed) {
   $feed->source_string = FALSE;
diff --git a/modules/aggregator/aggregator.install b/modules/aggregator/aggregator.install
index eecd14f..9625efc 100644
--- a/modules/aggregator/aggregator.install
+++ b/modules/aggregator/aggregator.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function aggregator_uninstall() {
   variable_del('aggregator_allowed_html_tags');
@@ -20,7 +20,7 @@ function aggregator_uninstall() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function aggregator_schema() {
   $schema['aggregator_category'] = array(
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 1e1686a..0d25f52 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -11,7 +11,7 @@
 define('AGGREGATOR_CLEAR_NEVER', 0);
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function aggregator_help($path, $arg) {
   switch ($path) {
@@ -45,7 +45,7 @@ function aggregator_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function aggregator_theme() {
   return array(
@@ -93,7 +93,7 @@ function aggregator_theme() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function aggregator_menu() {
   $items['admin/config/services/aggregator'] = array(
@@ -287,7 +287,7 @@ function _aggregator_has_categories() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function aggregator_permission() {
   return array(
@@ -301,7 +301,7 @@ function aggregator_permission() {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  *
  * Queues news feeds for updates once their refresh interval has elapsed.
  */
@@ -329,7 +329,7 @@ function aggregator_cron() {
 }
 
 /**
- * Implements hook_cron_queue_info().
+ * @implements hook_cron_queue_info().
  */
 function aggregator_cron_queue_info() {
   $queues['aggregator_feeds'] = array(
@@ -340,7 +340,7 @@ function aggregator_cron_queue_info() {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function aggregator_block_info() {
   $blocks = array();
@@ -356,7 +356,7 @@ function aggregator_block_info() {
 }
 
 /**
- * Implements hook_block_configure().
+ * @implements hook_block_configure().
  */
 function aggregator_block_configure($delta = '') {
   list($type, $id) = explode('-', $delta);
@@ -373,7 +373,7 @@ function aggregator_block_configure($delta = '') {
 }
 
 /**
- * Implements hook_block_save().
+ * @implements hook_block_save().
  */
 function aggregator_block_save($delta = '', $edit = array()) {
   list($type, $id) = explode('-', $delta);
@@ -386,7 +386,7 @@ function aggregator_block_save($delta = '', $edit = array()) {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  *
  * Generates blocks for the latest news items in each category and feed.
  */
diff --git a/modules/aggregator/aggregator.parser.inc b/modules/aggregator/aggregator.parser.inc
index cffd1c3..4ae1456 100644
--- a/modules/aggregator/aggregator.parser.inc
+++ b/modules/aggregator/aggregator.parser.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_aggregator_parse_info().
+ * @implements hook_aggregator_parse_info().
  */
 function aggregator_aggregator_parse_info() {
   return array(
@@ -16,7 +16,7 @@ function aggregator_aggregator_parse_info() {
 }
 
 /**
- * Implements hook_aggregator_parse().
+ * @implements hook_aggregator_parse().
  */
 function aggregator_aggregator_parse($feed) {
   global $channel, $image;
diff --git a/modules/aggregator/aggregator.processor.inc b/modules/aggregator/aggregator.processor.inc
index 6eb2c66..3d71cc1 100644
--- a/modules/aggregator/aggregator.processor.inc
+++ b/modules/aggregator/aggregator.processor.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_aggregator_process_info().
+ * @implements hook_aggregator_process_info().
  */
 function aggregator_aggregator_process_info() {
   return array(
@@ -16,7 +16,7 @@ function aggregator_aggregator_process_info() {
 }
 
 /**
- * Implements hook_aggregator_process().
+ * @implements hook_aggregator_process().
  */
 function aggregator_aggregator_process($feed) {
   if (is_object($feed)) {
@@ -44,7 +44,7 @@ function aggregator_aggregator_process($feed) {
 }
 
 /**
- * Implements hook_aggregator_remove().
+ * @implements hook_aggregator_remove().
  */
 function aggregator_aggregator_remove($feed) {
   $iids = db_query('SELECT iid FROM {aggregator_item} WHERE fid = :fid', array(':fid' => $feed->fid))->fetchCol();
@@ -61,7 +61,7 @@ function aggregator_aggregator_remove($feed) {
 }
 
 /**
- * Implements hook_form_aggregator_admin_form_alter().
+ * @implements hook_form_aggregator_admin_form_alter().
  *
  * Form alter aggregator module's own form to keep processor functionality
  * separate from aggregator API functionality.
diff --git a/modules/aggregator/tests/aggregator_test.module b/modules/aggregator/tests/aggregator_test.module
index 2d26a5d..5975120 100644
--- a/modules/aggregator/tests/aggregator_test.module
+++ b/modules/aggregator/tests/aggregator_test.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function aggregator_test_menu() {
   $items['aggregator/test-feed'] = array(
diff --git a/modules/block/block.install b/modules/block/block.install
index deed13a..1136c5c 100644
--- a/modules/block/block.install
+++ b/modules/block/block.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function block_schema() {
   $schema['block'] = array(
@@ -173,7 +173,7 @@ function block_schema() {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function block_install() {
 
diff --git a/modules/block/block.module b/modules/block/block.module
index c5e229b..956193a 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -41,7 +41,7 @@ define('BLOCK_VISIBILITY_LISTED', 1);
 define('BLOCK_VISIBILITY_PHP', 2);
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function block_help($path, $arg) {
   switch ($path) {
@@ -72,7 +72,7 @@ function block_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function block_theme() {
   return array(
@@ -89,7 +89,7 @@ function block_theme() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function block_permission() {
   return array(
@@ -100,7 +100,7 @@ function block_permission() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function block_menu() {
   $default_theme = variable_get('theme_default', 'bartik');
@@ -200,7 +200,7 @@ function _block_custom_theme($theme = NULL) {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function block_block_info() {
   $blocks = array();
@@ -215,7 +215,7 @@ function block_block_info() {
 }
 
 /**
- * Implements hook_block_configure().
+ * @implements hook_block_configure().
  */
 function block_block_configure($delta = 0) {
   if ($delta) {
@@ -228,14 +228,14 @@ function block_block_configure($delta = 0) {
 }
 
 /**
- * Implements hook_block_save().
+ * @implements hook_block_save().
  */
 function block_block_save($delta = 0, $edit = array()) {
   block_custom_block_save($edit, $delta);
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  *
  * Generates the administrator-defined blocks for display.
  */
@@ -247,7 +247,7 @@ function block_block_view($delta = '') {
 }
 
 /**
- * Implements hook_page_build().
+ * @implements hook_page_build().
  *
  * Render blocks into their regions.
  */
@@ -544,7 +544,7 @@ function block_custom_block_save($edit, $delta) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function block_form_user_profile_form_alter(&$form, &$form_state) {
   if ($form['#user_category'] == 'account') {
@@ -579,7 +579,7 @@ function block_form_user_profile_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_user_presave().
+ * @implements hook_user_presave().
  */
 function block_user_presave(&$edit, $account, $category) {
   if (isset($edit['block'])) {
@@ -718,7 +718,7 @@ function _block_load_blocks() {
 }
 
 /**
- * Implements hook_block_list_alter().
+ * @implements hook_block_list_alter().
  *
  * Check the page, user role and user specific visibilty settings.
  * Remove the block if the visibility conditions are not met.
@@ -894,7 +894,7 @@ function _block_get_cache_id($block) {
 }
 
 /**
- * Implements hook_flush_caches().
+ * @implements hook_flush_caches().
  */
 function block_flush_caches() {
   // Rehash blocks for active themes. We don't use list_themes() here,
@@ -950,7 +950,7 @@ function template_preprocess_block(&$variables) {
 }
 
 /**
- * Implements hook_user_role_delete().
+ * @implements hook_user_role_delete().
  *
  * Remove deleted role from blocks that use it.
  */
@@ -961,7 +961,7 @@ function block_user_role_delete($role) {
 }
 
 /**
- * Implements hook_menu_delete().
+ * @implements hook_menu_delete().
  */
 function block_menu_delete($menu) {
   db_delete('block')
@@ -975,7 +975,7 @@ function block_menu_delete($menu) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function block_form_system_performance_settings_alter(&$form, &$form_state) {
   $disabled = count(module_implements('node_grants'));
@@ -990,7 +990,7 @@ function block_form_system_performance_settings_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_admin_paths().
+ * @implements hook_admin_paths().
  */
 function block_admin_paths() {
   $paths = array(
@@ -1002,7 +1002,7 @@ function block_admin_paths() {
 }
 
 /**
- * Implements hook_modules_uninstalled().
+ * @implements hook_modules_uninstalled().
  *
  * Cleanup {block} and {block_role} tables from modules' blocks.
  */
diff --git a/modules/block/tests/block_test.module b/modules/block/tests/block_test.module
index 2abc433..b148653 100644
--- a/modules/block/tests/block_test.module
+++ b/modules/block/tests/block_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function block_test_block_info() {
   $blocks['test_cache'] = array(
@@ -21,7 +21,7 @@ function block_test_block_info() {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  */
 function block_test_block_view($delta = 0) {
   return array('content' => variable_get('block_test_content', ''));
diff --git a/modules/blog/blog.install b/modules/blog/blog.install
index f591e71..864da88 100644
--- a/modules/blog/blog.install
+++ b/modules/blog/blog.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function blog_install() {
   // Ensure the blog node type is available.
diff --git a/modules/blog/blog.module b/modules/blog/blog.module
index 98ebe51..211cea9 100644
--- a/modules/blog/blog.module
+++ b/modules/blog/blog.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_node_info().
+ * @implements hook_node_info().
  */
 function blog_node_info() {
   return array(
@@ -19,7 +19,7 @@ function blog_node_info() {
 }
 
 /**
- * Implements hook_user_view().
+ * @implements hook_user_view().
  */
 function blog_user_view($account) {
   if (user_access('create blog content', $account)) {
@@ -33,7 +33,7 @@ function blog_user_view($account) {
 }
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function blog_help($path, $arg) {
   switch ($path) {
@@ -56,14 +56,14 @@ function blog_help($path, $arg) {
 }
 
 /**
- * Implements hook_form().
+ * @implements hook_form().
  */
 function blog_form($node, $form_state) {
   return node_content_form($node, $form_state);
 }
 
 /**
- * Implements hook_view().
+ * @implements hook_view().
  */
 function blog_view($node, $view_mode) {
   if ($view_mode == 'full' && node_is_page($node)) {
@@ -74,7 +74,7 @@ function blog_view($node, $view_mode) {
 }
 
 /**
- * Implements hook_node_view().
+ * @implements hook_node_view().
  */
 function blog_node_view($node, $view_mode) {
   if ($view_mode != 'rss') {
@@ -94,7 +94,7 @@ function blog_node_view($node, $view_mode) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function blog_menu() {
   $items['blog'] = array(
@@ -133,7 +133,7 @@ function blog_menu() {
 }
 
 /**
- * Implements hook_menu_local_tasks_alter().
+ * @implements hook_menu_local_tasks_alter().
  */
 function blog_menu_local_tasks_alter(&$data, $router_item, $root_path) {
   global $user;
@@ -190,7 +190,7 @@ function _blog_post_exists($account) {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function blog_block_info() {
   $block['recent']['info'] = t('Recent blog posts');
@@ -199,7 +199,7 @@ function blog_block_info() {
 }
 
 /**
- * Implements hook_block_configure().
+ * @implements hook_block_configure().
  */
 function blog_block_configure($delta = '') {
   if ($delta == 'recent') {
@@ -214,7 +214,7 @@ function blog_block_configure($delta = '') {
 }
 
 /**
- * Implements hook_block_save().
+ * @implements hook_block_save().
  */
 function blog_block_save($delta = '', $edit = array()) {
   if ($delta == 'recent') {
@@ -223,7 +223,7 @@ function blog_block_save($delta = '', $edit = array()) {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  *
  * Displays the most recent 10 blog titles.
  */
@@ -255,7 +255,7 @@ function blog_block_view($delta = '') {
 }
 
 /**
- * Implements hook_rdf_mapping().
+ * @implements hook_rdf_mapping().
  */
 function blog_rdf_mapping() {
   return array(
diff --git a/modules/book/book.install b/modules/book/book.install
index 1bd094c..43c9308 100644
--- a/modules/book/book.install
+++ b/modules/book/book.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function book_install() {
   // Add the node type.
@@ -14,7 +14,7 @@ function book_install() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function book_uninstall() {
   // Delete menu links.
@@ -47,7 +47,7 @@ function _book_install_type_create() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function book_schema() {
   $schema['book'] = array(
diff --git a/modules/book/book.module b/modules/book/book.module
index 82d38f7..1f5d873 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function book_help($path, $arg) {
   switch ($path) {
@@ -33,7 +33,7 @@ function book_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function book_theme() {
   return array(
@@ -63,7 +63,7 @@ function book_theme() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function book_permission() {
   return array(
@@ -120,7 +120,7 @@ function book_node_view_link($node, $view_mode) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function book_menu() {
   $items['admin/content/book'] = array(
@@ -204,7 +204,7 @@ function _book_outline_remove_access($node) {
 }
 
 /**
- * Implements hook_admin_paths().
+ * @implements hook_admin_paths().
  */
 function book_admin_paths() {
   if (variable_get('node_admin_theme')) {
@@ -217,7 +217,7 @@ function book_admin_paths() {
 }
 
 /**
- * Implements hook_entity_info_alter().
+ * @implements hook_entity_info_alter().
  */
 function book_entity_info_alter(&$info) {
   // Add the 'Print' view mode for nodes.
@@ -230,7 +230,7 @@ function book_entity_info_alter(&$info) {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function book_block_info() {
   $block = array();
@@ -241,7 +241,7 @@ function book_block_info() {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  *
  * Displays the book table of contents in a block when the current page is a
  * single-node view of a book node.
@@ -298,7 +298,7 @@ function book_block_view($delta = '') {
 }
 
 /**
- * Implements hook_block_configure().
+ * @implements hook_block_configure().
  */
 function book_block_configure($delta = '') {
   $block = array();
@@ -318,7 +318,7 @@ function book_block_configure($delta = '') {
 }
 
 /**
- * Implements hook_block_save().
+ * @implements hook_block_save().
  */
 function book_block_save($delta = '', $edit = array()) {
   $block = array();
@@ -381,7 +381,7 @@ function book_get_books() {
 }
 
 /**
- * Implements hook_form_BASE_FORM_ID_alter().
+ * @implements hook_form_BASE_FORM_ID_alter().
  *
  * Adds the book fieldset to the node form.
  *
@@ -783,7 +783,7 @@ function book_menu_name($bid) {
 }
 
 /**
- * Implements hook_node_load().
+ * @implements hook_node_load().
  */
 function book_node_load($nodes, $types) {
   $result = db_query("SELECT * FROM {book} b INNER JOIN {menu_links} ml ON b.mlid = ml.mlid WHERE b.nid IN (:nids)", array(':nids' =>  array_keys($nodes)), array('fetch' => PDO::FETCH_ASSOC));
@@ -796,7 +796,7 @@ function book_node_load($nodes, $types) {
 }
 
 /**
- * Implements hook_node_view().
+ * @implements hook_node_view().
  */
 function book_node_view($node, $view_mode) {
   if ($view_mode == 'full') {
@@ -814,7 +814,7 @@ function book_node_view($node, $view_mode) {
 }
 
 /**
- * Implements hook_page_alter().
+ * @implements hook_page_alter().
  *
  * Add the book menu to the list of menus used to build the active trail when
  * viewing a book page.
@@ -828,7 +828,7 @@ function book_page_alter(&$page) {
 }
 
 /**
- * Implements hook_node_presave().
+ * @implements hook_node_presave().
  */
 function book_node_presave($node) {
   // Always save a revision for non-administrators.
@@ -846,7 +846,7 @@ function book_node_presave($node) {
 }
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function book_node_insert($node) {
   if (!empty($node->book['bid'])) {
@@ -861,7 +861,7 @@ function book_node_insert($node) {
 }
 
 /**
- * Implements hook_node_update().
+ * @implements hook_node_update().
  */
 function book_node_update($node) {
   if (!empty($node->book['bid'])) {
@@ -876,7 +876,7 @@ function book_node_update($node) {
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function book_node_delete($node) {
   if (!empty($node->book['bid'])) {
@@ -899,7 +899,7 @@ function book_node_delete($node) {
 }
 
 /**
- * Implements hook_node_prepare().
+ * @implements hook_node_prepare().
  */
 function book_node_prepare($node) {
   // Prepare defaults for the add/edit form.
@@ -1199,7 +1199,7 @@ function book_type_is_allowed($type) {
 }
 
 /**
- * Implements hook_node_type_update().
+ * @implements hook_node_type_update().
  *
  * Update book module's persistent variables if the machine-readable name of a
  * node type is changed.
diff --git a/modules/color/color.install b/modules/color/color.install
index 5705ade..857a440 100644
--- a/modules/color/color.install
+++ b/modules/color/color.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_requirements().
+ * @implements hook_requirements().
  */
 function color_requirements($phase) {
   $requirements = array();
diff --git a/modules/color/color.module b/modules/color/color.module
index ff6c70e..8aabc50 100644
--- a/modules/color/color.module
+++ b/modules/color/color.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function color_help($path, $arg) {
   switch ($path) {
@@ -19,7 +19,7 @@ function color_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function color_theme() {
   return array(
@@ -30,7 +30,7 @@ function color_theme() {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function color_form_system_theme_settings_alter(&$form, &$form_state) {
   if (isset($form_state['build_info']['args'][0]) && ($theme = $form_state['build_info']['args'][0]) && color_get_info($theme) && function_exists('gd_info')) {
@@ -47,7 +47,7 @@ function color_form_system_theme_settings_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function color_form_system_themes_alter(&$form, &$form_state) {
   _color_theme_select_form_alter($form, $form_state);
diff --git a/modules/comment/comment.install b/modules/comment/comment.install
index 44b323f..847438d 100644
--- a/modules/comment/comment.install
+++ b/modules/comment/comment.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function comment_uninstall() {
   // Delete comment_body field.
@@ -29,7 +29,7 @@ function comment_uninstall() {
 }
 
 /**
- * Implements hook_enable().
+ * @implements hook_enable().
  */
 function comment_enable() {
   // Insert records into the node_comment_statistics for nodes that are missing.
@@ -48,7 +48,7 @@ function comment_enable() {
 }
 
 /**
- * Implements hook_modules_enabled().
+ * @implements hook_modules_enabled().
  *
  * Creates comment body fields for node types existing before the comment module
  * is enabled. We use hook_modules_enabled() rather than hook_enable() so we can
@@ -79,7 +79,7 @@ function comment_modules_enabled($modules) {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function comment_schema() {
   $schema['comment'] = array(
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index f8c3a01..ff4a7ef 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -70,7 +70,7 @@ define('COMMENT_NODE_CLOSED', 1);
 define('COMMENT_NODE_OPEN', 2);
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function comment_help($path, $arg) {
   switch ($path) {
@@ -89,7 +89,7 @@ function comment_help($path, $arg) {
 }
 
 /**
- * Implements hook_entity_info().
+ * @implements hook_entity_info().
  */
 function comment_entity_info() {
   $return =  array(
@@ -158,7 +158,7 @@ function comment_uri($comment) {
 }
 
 /**
- * Implements hook_field_extra_fields().
+ * @implements hook_field_extra_fields().
  */
 function comment_field_extra_fields() {
   $return = array();
@@ -186,7 +186,7 @@ function comment_field_extra_fields() {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function comment_theme() {
   return array(
@@ -211,7 +211,7 @@ function comment_theme() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function comment_menu() {
   $items['admin/content/comment'] = array(
@@ -287,7 +287,7 @@ function comment_menu() {
 }
 
 /**
- * Implements hook_menu_alter().
+ * @implements hook_menu_alter().
  */
 function comment_menu_alter(&$items) {
   // Add comments to the description for admin/content.
@@ -312,7 +312,7 @@ function comment_count_unpublished() {
 }
 
 /**
- * Implements hook_node_type_insert().
+ * @implements hook_node_type_insert().
  *
  * Creates a comment body field for a node type created while the comment module
  * is enabled. For node types created before the comment module is enabled,
@@ -325,7 +325,7 @@ function comment_node_type_insert($info) {
 }
 
 /**
- * Implements hook_node_type_update().
+ * @implements hook_node_type_update().
  */
 function comment_node_type_update($info) {
   if (!empty($info->old_type) && $info->type != $info->old_type) {
@@ -334,7 +334,7 @@ function comment_node_type_update($info) {
 }
 
 /**
- * Implements hook_node_type_delete().
+ * @implements hook_node_type_delete().
  */
 function comment_node_type_delete($info) {
   field_attach_delete_bundle('comment', 'comment_node_' . $info->type);
@@ -389,7 +389,7 @@ function _comment_body_field_create($info) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function comment_permission() {
   return array(
@@ -412,7 +412,7 @@ function comment_permission() {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function comment_block_info() {
   $blocks['recent']['info'] = t('Recent comments');
@@ -422,7 +422,7 @@ function comment_block_info() {
 }
 
 /**
- * Implements hook_block_configure().
+ * @implements hook_block_configure().
  */
 function comment_block_configure($delta = '') {
   $form['comment_block_count'] = array(
@@ -436,14 +436,14 @@ function comment_block_configure($delta = '') {
 }
 
 /**
- * Implements hook_block_save().
+ * @implements hook_block_save().
  */
 function comment_block_save($delta = '', $edit = array()) {
   variable_set('comment_block_count', (int) $edit['comment_block_count']);
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  *
  * Generates a block with the most recent comments.
  */
@@ -605,7 +605,7 @@ function theme_comment_block() {
 }
 
 /**
- * Implements hook_node_view().
+ * @implements hook_node_view().
  */
 function comment_node_view($node, $view_mode) {
   $links = array();
@@ -1106,7 +1106,7 @@ function comment_view_multiple($comments, $node, $view_mode = 'full', $weight =
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function comment_form_node_type_form_alter(&$form, $form_state) {
   if (isset($form['type'])) {
@@ -1183,7 +1183,7 @@ function comment_form_node_type_form_alter(&$form, $form_state) {
 }
 
 /**
- * Implements hook_form_BASE_FORM_ID_alter().
+ * @implements hook_form_BASE_FORM_ID_alter().
  */
 function comment_form_node_form_alter(&$form, $form_state) {
   $node = $form['#node'];
@@ -1235,7 +1235,7 @@ function comment_form_node_form_alter(&$form, $form_state) {
 }
 
 /**
- * Implements hook_node_load().
+ * @implements hook_node_load().
  */
 function comment_node_load($nodes, $types) {
   $comments_enabled = array();
@@ -1270,7 +1270,7 @@ function comment_node_load($nodes, $types) {
 }
 
 /**
- * Implements hook_node_prepare().
+ * @implements hook_node_prepare().
  */
 function comment_node_prepare($node) {
   if (!isset($node->comment)) {
@@ -1279,7 +1279,7 @@ function comment_node_prepare($node) {
 }
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function comment_node_insert($node) {
   // Allow bulk updates and inserts to temporarily disable the
@@ -1299,7 +1299,7 @@ function comment_node_insert($node) {
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function comment_node_delete($node) {
   $cids = db_query('SELECT cid FROM {comment} WHERE nid = :nid', array(':nid' => $node->nid))->fetchCol();
@@ -1310,7 +1310,7 @@ function comment_node_delete($node) {
 }
 
 /**
- * Implements hook_node_update_index().
+ * @implements hook_node_update_index().
  */
 function comment_node_update_index($node) {
   $index_comments = &drupal_static(__FUNCTION__);
@@ -1348,7 +1348,7 @@ function comment_node_update_index($node) {
 }
 
 /**
- * Implements hook_update_index().
+ * @implements hook_update_index().
  */
 function comment_update_index() {
   // Store the maximum possible comments per thread (used for ranking by reply count)
@@ -1356,7 +1356,7 @@ function comment_update_index() {
 }
 
 /**
- * Implements hook_node_search_result().
+ * @implements hook_node_search_result().
  *
  * Formats a comment count string and returns it, for display with search
  * results.
@@ -1374,7 +1374,7 @@ function comment_node_search_result($node) {
 }
 
 /**
- * Implements hook_user_cancel().
+ * @implements hook_user_cancel().
  */
 function comment_user_cancel($edit, $account, $method) {
   switch ($method) {
@@ -1397,7 +1397,7 @@ function comment_user_cancel($edit, $account, $method) {
 }
 
 /**
- * Implements hook_user_delete().
+ * @implements hook_user_delete().
  */
 function comment_user_delete($account) {
   $cids = db_query('SELECT c.cid FROM {comment} c WHERE uid = :uid', array(':uid' => $account->uid))->fetchCol();
@@ -1813,7 +1813,7 @@ function comment_edit_page($comment) {
 }
 
 /**
- * Implements hook_forms().
+ * @implements hook_forms().
  */
 function comment_forms() {
   $forms = array();
@@ -2481,7 +2481,7 @@ function vancode2int($c = '00') {
 }
 
 /**
- * Implements hook_action_info().
+ * @implements hook_action_info().
  */
 function comment_action_info() {
   return array(
@@ -2633,7 +2633,7 @@ function comment_save_action($comment) {
 }
 
 /**
- * Implements hook_ranking().
+ * @implements hook_ranking().
  */
 function comment_ranking() {
   return array(
@@ -2653,7 +2653,7 @@ function comment_ranking() {
 }
 
 /**
- * Implements hook_rdf_mapping().
+ * @implements hook_rdf_mapping().
  */
 function comment_rdf_mapping() {
   return array(
@@ -2695,7 +2695,7 @@ function comment_rdf_mapping() {
 }
 
 /**
- * Implements hook_file_download_access().
+ * @implements hook_file_download_access().
  */
 function comment_file_download_access($field, $entity_type, $entity) {
   if ($entity_type == 'comment') {
diff --git a/modules/comment/comment.tokens.inc b/modules/comment/comment.tokens.inc
index d62b7e2..e8d753c 100644
--- a/modules/comment/comment.tokens.inc
+++ b/modules/comment/comment.tokens.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_token_info().
+ * @implements hook_token_info().
  */
 function comment_token_info() {
   $type = array(
@@ -100,7 +100,7 @@ function comment_token_info() {
 }
 
 /**
- * Implements hook_tokens().
+ * @implements hook_tokens().
  */
 function comment_tokens($type, $tokens, array $data = array(), array $options = array()) {
   $url_options = array('absolute' => TRUE);
diff --git a/modules/contact/contact.install b/modules/contact/contact.install
index 7ddea45..24fa706 100644
--- a/modules/contact/contact.install
+++ b/modules/contact/contact.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function contact_schema() {
   $schema['contact'] = array(
@@ -65,7 +65,7 @@ function contact_schema() {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function contact_install() {
   // Insert a default contact category.
@@ -80,7 +80,7 @@ function contact_install() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function contact_uninstall() {
   variable_del('contact_default_status');
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index eaae9c6..2768b92 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function contact_help($path, $arg) {
   switch ($path) {
@@ -35,7 +35,7 @@ function contact_help($path, $arg) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function contact_permission() {
   return array(
@@ -52,7 +52,7 @@ function contact_permission() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function contact_menu() {
   $items['admin/structure/contact'] = array(
@@ -165,7 +165,7 @@ function contact_load($cid) {
 }
 
 /**
- * Implements hook_mail().
+ * @implements hook_mail().
  */
 function contact_mail($key, &$message, $params) {
   $language = $message['language'];
@@ -208,7 +208,7 @@ function contact_mail($key, &$message, $params) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  *
  * Add the enable personal contact form to an individual user's account page.
  */
@@ -231,14 +231,14 @@ function contact_form_user_profile_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_user_presave().
+ * @implements hook_user_presave().
  */
 function contact_user_presave(&$edit, $account, $category) {
   $edit['data']['contact'] = isset($edit['contact']) ? $edit['contact'] : variable_get('contact_default_status', 1);
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  *
  * Add the default personal contact setting on the user settings page.
  */
diff --git a/modules/contextual/contextual.module b/modules/contextual/contextual.module
index 0d6b625..af83b9a 100644
--- a/modules/contextual/contextual.module
+++ b/modules/contextual/contextual.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function contextual_help($path, $arg) {
   switch ($path) {
@@ -24,7 +24,7 @@ function contextual_help($path, $arg) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function contextual_permission() {
   return array(
@@ -36,7 +36,7 @@ function contextual_permission() {
 }
 
 /**
- * Implements hook_library().
+ * @implements hook_library().
  */
 function contextual_library() {
   $path = drupal_get_path('module', 'contextual');
@@ -55,7 +55,7 @@ function contextual_library() {
 }
 
 /**
- * Implements hook_element_info().
+ * @implements hook_element_info().
  */
 function contextual_element_info() {
   $types['contextual_links'] = array(
diff --git a/modules/dashboard/dashboard.install b/modules/dashboard/dashboard.install
index 5021826..750f00f 100644
--- a/modules/dashboard/dashboard.install
+++ b/modules/dashboard/dashboard.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_disable().
+ * @implements hook_disable().
  *
  * Stash a list of blocks enabled on the dashboard, so they can be re-enabled
  * if the dashboard is re-enabled. Then disable those blocks, since the
@@ -41,7 +41,7 @@ function dashboard_disable() {
 }
 
 /**
- * Implements hook_enable().
+ * @implements hook_enable().
  *
  * Restores blocks to the dashboard that were there when the dashboard module
  * was disabled.
@@ -71,7 +71,7 @@ function dashboard_enable() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function dashboard_uninstall() {
   variable_del('dashboard_stashed_blocks');
diff --git a/modules/dashboard/dashboard.module b/modules/dashboard/dashboard.module
index 08a4cd2..bb06f45 100644
--- a/modules/dashboard/dashboard.module
+++ b/modules/dashboard/dashboard.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function dashboard_help($path, $arg) {
   switch ($path) {
@@ -27,7 +27,7 @@ function dashboard_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function dashboard_menu() {
   $items['admin/dashboard'] = array(
@@ -75,7 +75,7 @@ function dashboard_menu() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function dashboard_permission() {
   return array(
@@ -92,7 +92,7 @@ function dashboard_permission() {
 }
 
 /**
- * Implements hook_block_info_alter().
+ * @implements hook_block_info_alter().
  */
 function dashboard_block_info_alter(&$blocks, $theme, $code_blocks) {
   $admin_theme = variable_get('admin_theme');
@@ -111,7 +111,7 @@ function dashboard_block_info_alter(&$blocks, $theme, $code_blocks) {
 }
 
 /**
- * Implements hook_block_list_alter().
+ * @implements hook_block_list_alter().
  *
  * Skip rendering dashboard blocks when not on the dashboard page itself. This
  * prevents expensive dashboard blocks from causing performance issues on pages
@@ -128,7 +128,7 @@ function dashboard_block_list_alter(&$blocks) {
 }
 
 /**
- * Implements hook_page_build().
+ * @implements hook_page_build().
  *
  * Display dashboard blocks in the main content region.
  */
@@ -196,7 +196,7 @@ function dashboard_page_build(&$page) {
 }
 
 /**
- * Implements hook_system_info_alter().
+ * @implements hook_system_info_alter().
  *
  * Add regions to each theme to store the dashboard blocks.
  */
@@ -219,7 +219,7 @@ function dashboard_system_info_alter(&$info, $file, $type) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function dashboard_theme() {
   return array(
@@ -250,7 +250,7 @@ function dashboard_theme() {
 }
 
 /**
- * Implements hook_forms().
+ * @implements hook_forms().
  */
 function dashboard_forms() {
   // Reroute the dashboard configuration form to the main blocks administration
@@ -332,7 +332,7 @@ function dashboard_admin_blocks() {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function dashboard_form_block_admin_display_form_alter(&$form, &$form_state, $form_id) {
   // Hide dashboard regions (and any blocks placed within them) from the block
@@ -367,7 +367,7 @@ function dashboard_form_block_admin_display_form_alter(&$form, &$form_state, $fo
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function dashboard_form_dashboard_admin_display_form_alter(&$form, &$form_state) {
   // Redirect the 'configure' and 'delete' links on each block back to the
@@ -383,7 +383,7 @@ function dashboard_form_dashboard_admin_display_form_alter(&$form, &$form_state)
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function dashboard_form_block_admin_configure_alter(&$form, &$form_state) {
   global $theme_key;
@@ -403,7 +403,7 @@ function dashboard_form_block_admin_configure_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function dashboard_form_block_add_block_form_alter(&$form, &$form_state) {
   dashboard_form_block_admin_configure_alter($form, $form_state);
@@ -474,7 +474,7 @@ function dashboard_regions() {
 }
 
 /**
- * Implements hook_dashboard_regions().
+ * @implements hook_dashboard_regions().
  */
 function dashboard_dashboard_regions() {
   return array(
diff --git a/modules/dblog/dblog.install b/modules/dblog/dblog.install
index 23f85ba..4e496e2 100644
--- a/modules/dblog/dblog.install
+++ b/modules/dblog/dblog.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function dblog_schema() {
   $schema['watchdog'] = array(
@@ -92,7 +92,7 @@ function dblog_schema() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function dblog_uninstall() {
   variable_del('dblog_row_limit');
diff --git a/modules/dblog/dblog.module b/modules/dblog/dblog.module
index 496a043..1b01468 100644
--- a/modules/dblog/dblog.module
+++ b/modules/dblog/dblog.module
@@ -12,7 +12,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function dblog_help($path, $arg) {
   switch ($path) {
@@ -34,7 +34,7 @@ function dblog_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function dblog_menu() {
   $items['admin/reports/dblog'] = array(
@@ -84,7 +84,7 @@ function dblog_menu() {
 }
 
 /**
- * Implements hook_init().
+ * @implements hook_init().
  */
 function dblog_init() {
   if (arg(0) == 'admin' && arg(1) == 'reports') {
@@ -94,7 +94,7 @@ function dblog_init() {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  *
  * Remove expired log messages and flood control events.
  */
@@ -133,7 +133,7 @@ function _dblog_get_message_types() {
 }
 
 /**
- * Implements hook_watchdog().
+ * @implements hook_watchdog().
  *
  * Note some values may be truncated for database column size restrictions.
  */
@@ -158,7 +158,7 @@ function dblog_watchdog(array $log_entry) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function dblog_form_system_logging_settings_alter(&$form, $form_state) {
   $form['dblog_row_limit'] = array(
@@ -172,7 +172,7 @@ function dblog_form_system_logging_settings_alter(&$form, $form_state) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function dblog_theme() {
   return array(
diff --git a/modules/field/field.install b/modules/field/field.install
index 16b09e1..6b03242 100644
--- a/modules/field/field.install
+++ b/modules/field/field.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function field_schema() {
   // Static (meta) tables.
diff --git a/modules/field/field.module b/modules/field/field.module
index 163f448..2ab9b08 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -306,14 +306,14 @@ define('FIELD_LOAD_REVISION', 'FIELD_LOAD_REVISION');
 class FieldUpdateForbiddenException extends FieldException {}
 
 /**
- * Implements hook_flush_caches().
+ * @implements hook_flush_caches().
  */
 function field_flush_caches() {
   return array('cache_field');
 }
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function field_help($path, $arg) {
   switch ($path) {
@@ -351,7 +351,7 @@ function field_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function field_theme() {
   return array(
@@ -365,7 +365,7 @@ function field_theme() {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  *
  * Purges some deleted Field API data, if any exists.
  */
@@ -375,7 +375,7 @@ function field_cron() {
 }
 
 /**
- * Implements hook_modules_uninstalled().
+ * @implements hook_modules_uninstalled().
  */
 function field_modules_uninstalled($modules) {
   module_load_include('inc', 'field', 'field.crud');
@@ -386,7 +386,7 @@ function field_modules_uninstalled($modules) {
 }
 
 /**
- * Implements hook_modules_enabled().
+ * @implements hook_modules_enabled().
  */
 function field_modules_enabled($modules) {
   foreach ($modules as $module) {
@@ -396,7 +396,7 @@ function field_modules_enabled($modules) {
 }
 
 /**
- * Implements hook_modules_disabled().
+ * @implements hook_modules_disabled().
  */
 function field_modules_disabled($modules) {
   // Track fields whose field type is being disabled.
diff --git a/modules/field/field.multilingual.inc b/modules/field/field.multilingual.inc
index 00adf92..7ec03e3 100644
--- a/modules/field/field.multilingual.inc
+++ b/modules/field/field.multilingual.inc
@@ -60,7 +60,7 @@
  */
 
 /**
- * Implements hook_multilingual_settings_changed().
+ * @implements hook_multilingual_settings_changed().
  */
 function field_multilingual_settings_changed() {
   field_info_cache_clear();
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.install b/modules/field/modules/field_sql_storage/field_sql_storage.install
index 4a3a00e..2b5c9fb 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.install
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function field_sql_storage_schema() {
   $schema = array();
diff --git a/modules/field/modules/field_sql_storage/field_sql_storage.module b/modules/field/modules/field_sql_storage/field_sql_storage.module
index 6f49167..7c08e95 100644
--- a/modules/field/modules/field_sql_storage/field_sql_storage.module
+++ b/modules/field/modules/field_sql_storage/field_sql_storage.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function field_sql_storage_help($path, $arg) {
   switch ($path) {
@@ -19,7 +19,7 @@ function field_sql_storage_help($path, $arg) {
 }
 
 /**
- * Implements hook_field_storage_info().
+ * @implements hook_field_storage_info().
  */
 function field_sql_storage_field_storage_info() {
   return array(
@@ -208,7 +208,7 @@ function _field_sql_storage_schema($field) {
 }
 
 /**
- * Implements hook_field_storage_create_field().
+ * @implements hook_field_storage_create_field().
  */
 function field_sql_storage_field_storage_create_field($field) {
   $schema = _field_sql_storage_schema($field);
@@ -219,7 +219,7 @@ function field_sql_storage_field_storage_create_field($field) {
 }
 
 /**
- * Implements hook_field_update_forbid().
+ * @implements hook_field_update_forbid().
  *
  * Forbid any field update that changes column definitions if there is
  * any data.
@@ -231,7 +231,7 @@ function field_sql_storage_field_update_forbid($field, $prior_field, $has_data)
 }
 
 /**
- * Implements hook_field_storage_update_field().
+ * @implements hook_field_storage_update_field().
  */
 function field_sql_storage_field_storage_update_field($field, $prior_field, $has_data) {
   if (! $has_data) {
@@ -276,7 +276,7 @@ function field_sql_storage_field_storage_update_field($field, $prior_field, $has
 }
 
 /**
- * Implements hook_field_storage_delete_field().
+ * @implements hook_field_storage_delete_field().
  */
 function field_sql_storage_field_storage_delete_field($field) {
   // Mark all data associated with the field for deletion.
@@ -297,7 +297,7 @@ function field_sql_storage_field_storage_delete_field($field) {
 }
 
 /**
- * Implements hook_field_storage_load().
+ * @implements hook_field_storage_load().
  */
 function field_sql_storage_field_storage_load($entity_type, $entities, $age, $fields, $options) {
   $field_info = field_info_field_by_ids();
@@ -345,7 +345,7 @@ function field_sql_storage_field_storage_load($entity_type, $entities, $age, $fi
 }
 
 /**
- * Implements hook_field_storage_write().
+ * @implements hook_field_storage_write().
  */
 function field_sql_storage_field_storage_write($entity_type, $entity, $op, $fields) {
   list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
@@ -428,7 +428,7 @@ function field_sql_storage_field_storage_write($entity_type, $entity, $op, $fiel
 }
 
 /**
- * Implements hook_field_storage_delete().
+ * @implements hook_field_storage_delete().
  *
  * This function deletes data for all fields for an entity from the database.
  */
@@ -444,7 +444,7 @@ function field_sql_storage_field_storage_delete($entity_type, $entity, $fields)
 }
 
 /**
- * Implements hook_field_storage_purge().
+ * @implements hook_field_storage_purge().
  *
  * This function deletes data from the database for a single field on
  * an entity.
@@ -465,7 +465,7 @@ function field_sql_storage_field_storage_purge($entity_type, $entity, $field, $i
 }
 
 /**
- * Implements hook_field_storage_query().
+ * @implements hook_field_storage_query().
  */
 function field_sql_storage_field_storage_query(EntityFieldQuery $query) {
   $groups = array();
@@ -592,7 +592,7 @@ function _field_sql_storage_query_join_entity(SelectQuery $select_query, $entity
 }
 
 /**
- * Implements hook_field_storage_delete_revision().
+ * @implements hook_field_storage_delete_revision().
  *
  * This function actually deletes the data from the database.
  */
@@ -613,7 +613,7 @@ function field_sql_storage_field_storage_delete_revision($entity_type, $entity,
 }
 
 /**
- * Implements hook_field_storage_delete_instance().
+ * @implements hook_field_storage_delete_instance().
  *
  * This function simply marks for deletion all data associated with the field.
  */
@@ -634,7 +634,7 @@ function field_sql_storage_field_storage_delete_instance($instance) {
 }
 
 /**
- * Implements hook_field_attach_rename_bundle().
+ * @implements hook_field_attach_rename_bundle().
  */
 function field_sql_storage_field_attach_rename_bundle($entity_type, $bundle_old, $bundle_new) {
   // We need to account for deleted or inactive fields and instances.
@@ -659,7 +659,7 @@ function field_sql_storage_field_attach_rename_bundle($entity_type, $bundle_old,
 }
 
 /**
- * Implements hook_field_storage_purge_field().
+ * @implements hook_field_storage_purge_field().
  *
  * All field data items and instances have already been purged, so all
  * that is left is to delete the table.
@@ -672,7 +672,7 @@ function field_sql_storage_field_storage_purge_field($field) {
 }
 
 /**
- * Implements hook_field_storage_details().
+ * @implements hook_field_storage_details().
  */
 function field_sql_storage_field_storage_details($field) {
   $details = array();
diff --git a/modules/field/modules/list/list.install b/modules/field/modules/list/list.install
index c86a219..d4f0960 100644
--- a/modules/field/modules/list/list.install
+++ b/modules/field/modules/list/list.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_field_schema().
+ * @implements hook_field_schema().
  */
 function list_field_schema($field) {
   switch ($field['type']) {
diff --git a/modules/field/modules/list/list.module b/modules/field/modules/list/list.module
index f7ac951..559576c 100644
--- a/modules/field/modules/list/list.module
+++ b/modules/field/modules/list/list.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function list_help($path, $arg) {
   switch ($path) {
@@ -19,7 +19,7 @@ function list_help($path, $arg) {
 }
 
 /**
- * Implements hook_field_info().
+ * @implements hook_field_info().
  */
 function list_field_info() {
   return array(
@@ -55,7 +55,7 @@ function list_field_info() {
 }
 
 /**
- * Implements hook_field_settings_form().
+ * @implements hook_field_settings_form().
  */
 function list_field_settings_form($field, $instance, $has_data) {
   $settings = $field['settings'];
@@ -207,7 +207,7 @@ function list_boolean_allowed_values_callback($element, $input, $form_state) {
 }
 
 /**
- * Implements hook_field_update_field().
+ * @implements hook_field_update_field().
  */
 function list_field_update_field($field, $prior_field, $has_data) {
   drupal_static_reset('list_allowed_values');
@@ -338,7 +338,7 @@ function list_allowed_values_string($values) {
 }
 
 /**
- * Implements hook_field_update_forbid().
+ * @implements hook_field_update_forbid().
  */
 function list_field_update_forbid($field, $prior_field, $has_data) {
   if ($field['module'] == 'list' && $has_data) {
@@ -367,7 +367,7 @@ function _list_values_in_use($field, $values) {
 }
 
 /**
- * Implements hook_field_validate().
+ * @implements hook_field_validate().
  *
  * Possible error codes:
  * - 'list_illegal_value': The value is not part of the list of allowed values.
@@ -387,7 +387,7 @@ function list_field_validate($entity_type, $entity, $field, $instance, $langcode
 }
 
 /**
- * Implements hook_field_is_empty().
+ * @implements hook_field_is_empty().
  */
 function list_field_is_empty($item, $field) {
   if (empty($item['value']) && (string) $item['value'] !== '0') {
@@ -397,7 +397,7 @@ function list_field_is_empty($item, $field) {
 }
 
 /**
- * Implements hook_field_widget_info_alter().
+ * @implements hook_field_widget_info_alter().
  *
  * The List module does not implement widgets of its own, but reuses the
  * widgets defined in options.module.
@@ -417,14 +417,14 @@ function list_field_widget_info_alter(&$info) {
 }
 
 /**
- * Implements hook_options_list().
+ * @implements hook_options_list().
  */
 function list_options_list($field) {
   return list_allowed_values($field);
 }
 
 /**
- * Implements hook_field_formatter_info().
+ * @implements hook_field_formatter_info().
  */
 function list_field_formatter_info() {
   return array(
@@ -440,7 +440,7 @@ function list_field_formatter_info() {
 }
 
 /**
- * Implements hook_field_formatter_view().
+ * @implements hook_field_formatter_view().
  */
 function list_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
diff --git a/modules/field/modules/number/number.install b/modules/field/modules/number/number.install
index 02c7a30..ebae1ca 100644
--- a/modules/field/modules/number/number.install
+++ b/modules/field/modules/number/number.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_field_schema().
+ * @implements hook_field_schema().
  */
 function number_field_schema($field) {
   switch ($field['type']) {
diff --git a/modules/field/modules/number/number.module b/modules/field/modules/number/number.module
index fe1221c..361a4f1 100644
--- a/modules/field/modules/number/number.module
+++ b/modules/field/modules/number/number.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function number_help($path, $arg) {
   switch ($path) {
@@ -19,7 +19,7 @@ function number_help($path, $arg) {
 }
 
 /**
- * Implements hook_field_info().
+ * @implements hook_field_info().
  */
 function number_field_info() {
   return array(
@@ -50,7 +50,7 @@ function number_field_info() {
 }
 
 /**
- * Implements hook_field_settings_form().
+ * @implements hook_field_settings_form().
  */
 function number_field_settings_form($field, $instance, $has_data) {
   $settings = $field['settings'];
@@ -88,7 +88,7 @@ function number_field_settings_form($field, $instance, $has_data) {
 }
 
 /**
- * Implements hook_field_instance_settings_form().
+ * @implements hook_field_instance_settings_form().
  */
 function number_field_instance_settings_form($field, $instance) {
   $settings = $instance['settings'];
@@ -126,7 +126,7 @@ function number_field_instance_settings_form($field, $instance) {
 }
 
 /**
- * Implements hook_field_validate().
+ * @implements hook_field_validate().
  *
  * Possible error codes:
  * - 'number_min': The value is less than the allowed minimum value.
@@ -152,7 +152,7 @@ function number_field_validate($entity_type, $entity, $field, $instance, $langco
 }
 
 /**
- * Implements hook_field_presave().
+ * @implements hook_field_presave().
  */
 function number_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
   if ($field['type'] == 'number_decimal') {
@@ -167,7 +167,7 @@ function number_field_presave($entity_type, $entity, $field, $instance, $langcod
 }
 
 /**
- * Implements hook_field_is_empty().
+ * @implements hook_field_is_empty().
  */
 function number_field_is_empty($item, $field) {
   if (empty($item['value']) && (string) $item['value'] !== '0') {
@@ -177,7 +177,7 @@ function number_field_is_empty($item, $field) {
 }
 
 /**
- * Implements hook_field_formatter_info().
+ * @implements hook_field_formatter_info().
  */
 function number_field_formatter_info() {
   return array(
@@ -209,7 +209,7 @@ function number_field_formatter_info() {
 }
 
 /**
- * Implements hook_field_formatter_settings_form().
+ * @implements hook_field_formatter_settings_form().
  */
 function number_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
   $display = $instance['display'][$view_mode];
@@ -254,7 +254,7 @@ function number_field_formatter_settings_form($field, $instance, $view_mode, $fo
 }
 
 /**
- * Implements hook_field_formatter_settings_summary().
+ * @implements hook_field_formatter_settings_summary().
  */
 function number_field_formatter_settings_summary($field, $instance, $view_mode) {
   $display = $instance['display'][$view_mode];
@@ -270,7 +270,7 @@ function number_field_formatter_settings_summary($field, $instance, $view_mode)
 }
 
 /**
- * Implements hook_field_formatter_view().
+ * @implements hook_field_formatter_view().
  */
 function number_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
@@ -303,7 +303,7 @@ function number_field_formatter_view($entity_type, $entity, $field, $instance, $
 }
 
 /**
- * Implements hook_field_widget_info().
+ * @implements hook_field_widget_info().
  */
 function number_field_widget_info() {
   return array(
@@ -315,7 +315,7 @@ function number_field_widget_info() {
 }
 
 /**
- * Implements hook_field_widget_form().
+ * @implements hook_field_widget_form().
  */
 function number_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
   $value = isset($items[$delta]['value']) ? $items[$delta]['value'] : '';
@@ -389,7 +389,7 @@ function number_field_widget_validate($element, &$form_state) {
 }
 
 /**
- * Implements hook_field_widget_error().
+ * @implements hook_field_widget_error().
  */
 function number_field_widget_error($element, $error, $form, &$form_state) {
   form_error($element['value'], $error['message']);
diff --git a/modules/field/modules/options/options.module b/modules/field/modules/options/options.module
index 385f3f4..b9be6b7 100644
--- a/modules/field/modules/options/options.module
+++ b/modules/field/modules/options/options.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function options_help($path, $arg) {
   switch ($path) {
@@ -19,7 +19,7 @@ function options_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function options_theme() {
   return array(
@@ -30,7 +30,7 @@ function options_theme() {
 }
 
 /**
- * Implements hook_field_widget_info().
+ * @implements hook_field_widget_info().
  *
  * Field type modules willing to use those widgets should:
  * - Use hook_field_widget_info_alter() to append their field own types to the
@@ -66,7 +66,7 @@ function options_field_widget_info() {
 }
 
 /**
- * Implements hook_field_widget_form().
+ * @implements hook_field_widget_form().
  */
 function options_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
   // Abstract over the actual field columns, to allow different field types to
@@ -139,7 +139,7 @@ function options_field_widget_form(&$form, &$form_state, $field, $instance, $lan
 }
 
 /**
- * Implements hook_field_widget_settings_form().
+ * @implements hook_field_widget_settings_form().
  */
 function options_field_widget_settings_form($field, $instance) {
   $form = array();
@@ -370,7 +370,7 @@ function options_array_flatten($array) {
 }
 
 /**
- * Implements hook_field_widget_error().
+ * @implements hook_field_widget_error().
  */
 function options_field_widget_error($element, $error, $form, &$form_state) {
   form_error($element, $error['message']);
diff --git a/modules/field/modules/text/text.install b/modules/field/modules/text/text.install
index 1b8d00b..122a7cb 100644
--- a/modules/field/modules/text/text.install
+++ b/modules/field/modules/text/text.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_field_schema().
+ * @implements hook_field_schema().
  */
 function text_field_schema($field) {
   switch ($field['type']) {
diff --git a/modules/field/modules/text/text.module b/modules/field/modules/text/text.module
index 89c605c..5e2ce9a 100644
--- a/modules/field/modules/text/text.module
+++ b/modules/field/modules/text/text.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function text_help($path, $arg) {
   switch ($path) {
@@ -19,7 +19,7 @@ function text_help($path, $arg) {
 }
 
 /**
- * Implements hook_field_info().
+ * @implements hook_field_info().
  *
  * Field settings:
  *   - max_length: the maximum length for a varchar field.
@@ -57,7 +57,7 @@ function text_field_info() {
 }
 
 /**
- * Implements hook_field_settings_form().
+ * @implements hook_field_settings_form().
  */
 function text_field_settings_form($field, $instance, $has_data) {
   $settings = $field['settings'];
@@ -82,7 +82,7 @@ function text_field_settings_form($field, $instance, $has_data) {
 }
 
 /**
- * Implements hook_field_instance_settings_form().
+ * @implements hook_field_instance_settings_form().
  */
 function text_field_instance_settings_form($field, $instance) {
   $settings = $instance['settings'];
@@ -109,7 +109,7 @@ function text_field_instance_settings_form($field, $instance) {
 }
 
 /**
- * Implements hook_field_validate().
+ * @implements hook_field_validate().
  *
  * Possible error codes:
  * - 'text_value_max_length': The value exceeds the maximum length.
@@ -142,7 +142,7 @@ function text_field_validate($entity_type, $entity, $field, $instance, $langcode
 }
 
 /**
- * Implements hook_field_load().
+ * @implements hook_field_load().
  *
  * Where possible, generate the sanitized version of each field early so that
  * it is cached in the field cache. This avoids looking up from the filter cache
@@ -166,7 +166,7 @@ function text_field_load($entity_type, $entities, $field, $instances, $langcode,
 }
 
 /**
- * Implements hook_field_is_empty().
+ * @implements hook_field_is_empty().
  */
 function text_field_is_empty($item, $field) {
   if (!isset($item['value']) || $item['value'] === '') {
@@ -176,7 +176,7 @@ function text_field_is_empty($item, $field) {
 }
 
 /**
- * Implements hook_field_formatter_info().
+ * @implements hook_field_formatter_info().
  */
 function text_field_formatter_info() {
   return array(
@@ -213,7 +213,7 @@ function text_field_formatter_info() {
 }
 
 /**
- * Implements hook_field_formatter_settings_form().
+ * @implements hook_field_formatter_settings_form().
  */
 function text_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
   $display = $instance['display'][$view_mode];
@@ -236,7 +236,7 @@ function text_field_formatter_settings_form($field, $instance, $view_mode, $form
 }
 
 /**
- * Implements hook_field_formatter_settings_summary().
+ * @implements hook_field_formatter_settings_summary().
  */
 function text_field_formatter_settings_summary($field, $instance, $view_mode) {
   $display = $instance['display'][$view_mode];
@@ -252,7 +252,7 @@ function text_field_formatter_settings_summary($field, $instance, $view_mode) {
 }
 
 /**
- * Implements hook_field_formatter_view().
+ * @implements hook_field_formatter_view().
  */
 function text_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
@@ -445,7 +445,7 @@ function text_summary($text, $format = NULL, $size = NULL) {
 }
 
 /**
- * Implements hook_field_widget_info().
+ * @implements hook_field_widget_info().
  */
 function text_field_widget_info() {
   return array(
@@ -468,7 +468,7 @@ function text_field_widget_info() {
 }
 
 /**
- * Implements hook_field_widget_settings_form().
+ * @implements hook_field_widget_settings_form().
  */
 function text_field_widget_settings_form($field, $instance) {
   $widget = $instance['widget'];
@@ -497,7 +497,7 @@ function text_field_widget_settings_form($field, $instance) {
 }
 
 /**
- * Implements hook_field_widget_form().
+ * @implements hook_field_widget_form().
  */
 function text_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
   $summary_widget = array();
@@ -562,7 +562,7 @@ function text_field_widget_form(&$form, &$form_state, $field, $instance, $langco
 }
 
 /**
- * Implements hook_field_widget_error().
+ * @implements hook_field_widget_error().
  */
 function text_field_widget_error($element, $error, $form, &$form_state) {
   switch ($error['error']) {
@@ -579,7 +579,7 @@ function text_field_widget_error($element, $error, $form, &$form_state) {
 }
 
 /**
- * Implements hook_field_prepare_translation().
+ * @implements hook_field_prepare_translation().
  */
 function text_field_prepare_translation($entity_type, $entity, $field, $instance, $langcode, &$items, $source_entity, $source_langcode) {
   // If the translating user is not permitted to use the assigned text format,
@@ -597,14 +597,14 @@ function text_field_prepare_translation($entity_type, $entity, $field, $instance
 }
 
 /**
- * Implements hook_filter_format_update().
+ * @implements hook_filter_format_update().
  */
 function text_filter_format_update($format) {
   field_cache_clear();
 }
 
 /**
- * Implements hook_filter_format_disable().
+ * @implements hook_filter_format_disable().
  */
 function text_filter_format_disable($format) {
   field_cache_clear();
diff --git a/modules/field/tests/field_test.entity.inc b/modules/field/tests/field_test.entity.inc
index b7c70a6..6c53cfb 100644
--- a/modules/field/tests/field_test.entity.inc
+++ b/modules/field/tests/field_test.entity.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_entity_info().
+ * @implements hook_entity_info().
  */
 function field_test_entity_info() {
   $bundles = variable_get('field_test_bundles', array('test_bundle' => array('label' => 'Test Bundle')));
@@ -121,7 +121,7 @@ function field_test_entity_info() {
 }
 
 /**
- * Implements hook_entity_info_alter().
+ * @implements hook_entity_info_alter().
  */
 function field_test_entity_info_alter(&$entity_info) {
   // Enable/disable field_test as a translation handler.
diff --git a/modules/field/tests/field_test.field.inc b/modules/field/tests/field_test.field.inc
index b8a2939..d21c73d 100644
--- a/modules/field/tests/field_test.field.inc
+++ b/modules/field/tests/field_test.field.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_field_info().
+ * @implements hook_field_info().
  */
 function field_test_field_info() {
   return array(
@@ -46,7 +46,7 @@ function field_test_field_info() {
 }
 
 /**
- * Implements hook_field_update_forbid().
+ * @implements hook_field_update_forbid().
  */
 function field_test_field_update_forbid($field, $prior_field, $has_data) {
   if ($field['type'] == 'test_field' && $field['settings']['unchangeable'] != $prior_field['settings']['unchangeable']) {
@@ -55,7 +55,7 @@ function field_test_field_update_forbid($field, $prior_field, $has_data) {
 }
 
 /**
- * Implements hook_field_load().
+ * @implements hook_field_load().
  */
 function field_test_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
   foreach ($items as $id => $item) {
@@ -73,7 +73,7 @@ function field_test_field_load($entity_type, $entities, $field, $instances, $lan
 }
 
 /**
- * Implements hook_field_validate().
+ * @implements hook_field_validate().
  *
  * Possible error codes:
  * - 'field_test_invalid': The value is invalid.
@@ -90,14 +90,14 @@ function field_test_field_validate($entity_type, $entity, $field, $instance, $la
 }
 
 /**
- * Implements hook_field_is_empty().
+ * @implements hook_field_is_empty().
  */
 function field_test_field_is_empty($item, $field) {
   return empty($item['value']);
 }
 
 /**
- * Implements hook_field_settings_form().
+ * @implements hook_field_settings_form().
  */
 function field_test_field_settings_form($field, $instance, $has_data) {
   $settings = $field['settings'];
@@ -114,7 +114,7 @@ function field_test_field_settings_form($field, $instance, $has_data) {
 }
 
 /**
- * Implements hook_field_instance_settings_form().
+ * @implements hook_field_instance_settings_form().
  */
 function field_test_field_instance_settings_form($field, $instance) {
   $settings = $instance['settings'];
@@ -131,7 +131,7 @@ function field_test_field_instance_settings_form($field, $instance) {
 }
 
 /**
- * Implements hook_field_widget_info().
+ * @implements hook_field_widget_info().
  */
 function field_test_field_widget_info() {
   return array(
@@ -152,7 +152,7 @@ function field_test_field_widget_info() {
 }
 
 /**
- * Implements hook_field_widget_form().
+ * @implements hook_field_widget_form().
  */
 function field_test_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
   switch ($instance['widget']['type']) {
@@ -190,7 +190,7 @@ function field_test_widget_multiple_validate($element, &$form_state) {
 }
 
 /**
- * Implements hook_field_widget_error().
+ * @implements hook_field_widget_error().
  */
 function field_test_field_widget_error($element, $error, $form, &$form_state) {
   // @todo No easy way to differenciate widget types, we should receive it as a
@@ -208,7 +208,7 @@ function field_test_field_widget_error($element, $error, $form, &$form_state) {
 }
 
 /**
- * Implements hook_field_widget_settings_form().
+ * @implements hook_field_widget_settings_form().
  */
 function field_test_field_widget_settings_form($field, $instance) {
   $widget = $instance['widget'];
@@ -226,7 +226,7 @@ function field_test_field_widget_settings_form($field, $instance) {
 }
 
 /**
- * Implements hook_field_formatter_info().
+ * @implements hook_field_formatter_info().
  */
 function field_test_field_formatter_info() {
   return array(
@@ -257,7 +257,7 @@ function field_test_field_formatter_info() {
 }
 
 /**
- * Implements hook_field_formatter_settings_form().
+ * @implements hook_field_formatter_settings_form().
  */
 function field_test_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
   $display = $instance['display'][$view_mode];
@@ -288,7 +288,7 @@ function field_test_field_formatter_settings_form($field, $instance, $view_mode,
 }
 
 /**
- * Implements hook_field_formatter_settings_summary().
+ * @implements hook_field_formatter_settings_summary().
  */
 function field_test_field_formatter_settings_summary($field, $instance, $view_mode) {
   $display = $instance['display'][$view_mode];
@@ -312,7 +312,7 @@ function field_test_field_formatter_settings_summary($field, $instance, $view_mo
 }
 
 /**
- * Implements hook_field_formatter_prepare_view().
+ * @implements hook_field_formatter_prepare_view().
  */
 function field_test_field_formatter_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items, $displays) {
   foreach ($items as $id => $item) {
@@ -330,7 +330,7 @@ function field_test_field_formatter_prepare_view($entity_type, $entities, $field
 }
 
 /**
- * Implements hook_field_formatter_view().
+ * @implements hook_field_formatter_view().
  */
 function field_test_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
@@ -369,7 +369,7 @@ function field_test_default_value($entity_type, $entity, $field, $instance) {
 }
 
 /**
- * Implements hook_field_access().
+ * @implements hook_field_access().
  */
 function field_test_field_access($op, $field, $entity_type, $entity, $account) {
   if ($field['field_name'] == "field_no_{$op}_access") {
diff --git a/modules/field/tests/field_test.install b/modules/field/tests/field_test.install
index 5957561..bfea465 100644
--- a/modules/field/tests/field_test.install
+++ b/modules/field/tests/field_test.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function field_test_install() {
   // hook_entity_info_alter() needs to be executed as last.
@@ -17,7 +17,7 @@ function field_test_install() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function field_test_schema() {
   $schema['test_entity'] = array(
@@ -114,7 +114,7 @@ function field_test_schema() {
 }
 
 /**
- * Implements hook_field_schema().
+ * @implements hook_field_schema().
  */
 function field_test_field_schema($field) {
   if ($field['type'] == 'test_field') {
diff --git a/modules/field/tests/field_test.module b/modules/field/tests/field_test.module
index 237b833..61298dc 100644
--- a/modules/field/tests/field_test.module
+++ b/modules/field/tests/field_test.module
@@ -18,7 +18,7 @@ require_once DRUPAL_ROOT . '/modules/field/tests/field_test.field.inc';
 require_once DRUPAL_ROOT . '/modules/field/tests/field_test.storage.inc';
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function field_test_permission() {
   $perms = array(
@@ -35,7 +35,7 @@ function field_test_permission() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function field_test_menu() {
   $items = array();
@@ -94,7 +94,7 @@ function field_test_field_test_op_multiple($entity_type, $entities, $field, $ins
 }
 
 /**
- * Implements hook_field_available_languages_alter().
+ * @implements hook_field_available_languages_alter().
  */
 function field_test_field_available_languages_alter(&$languages, $context) {
   if (variable_get('field_test_field_available_languages_alter', FALSE)) {
@@ -107,7 +107,7 @@ function field_test_field_available_languages_alter(&$languages, $context) {
 }
 
 /**
- * Implements hook_field_language_alter().
+ * @implements hook_field_language_alter().
  */
 function field_test_field_language_alter(&$display_language, $context) {
   if (variable_get('field_test_language_fallback', TRUE)) {
@@ -202,7 +202,7 @@ function field_test_field_delete($entity_type, $entity, $field, $instance, $item
 }
 
 /**
- * Implements hook_entity_query_alter().
+ * @implements hook_entity_query_alter().
  */
 function field_test_entity_query_alter(&$query) {
   if (!empty($query->alterMyExecuteCallbackPlease)) {
@@ -238,7 +238,7 @@ function field_test_entity_label_callback($entity_type, $entity) {
 }
 
 /**
- * Implements hook_field_attach_view_alter().
+ * @implements hook_field_attach_view_alter().
  */
 function field_test_field_attach_view_alter(&$output, $context) {
   if (!empty($context['display']['settings']['alter'])) {
diff --git a/modules/field/tests/field_test.storage.inc b/modules/field/tests/field_test.storage.inc
index 3ca322d..9f21dc7 100644
--- a/modules/field/tests/field_test.storage.inc
+++ b/modules/field/tests/field_test.storage.inc
@@ -7,7 +7,7 @@
 
 
 /**
- * Implements hook_field_storage_info().
+ * @implements hook_field_storage_info().
  */
 function field_test_field_storage_info() {
   return array(
@@ -23,7 +23,7 @@ function field_test_field_storage_info() {
 }
 
 /**
- * Implements hook_field_storage_details().
+ * @implements hook_field_storage_details().
  */
 function field_test_field_storage_details($field) {
   $details = array();
@@ -42,7 +42,7 @@ function field_test_field_storage_details($field) {
 }
 
 /**
- * Implements hook_field_storage_details_alter().
+ * @implements hook_field_storage_details_alter().
  *
  * @see FieldAttachStorageTestCase::testFieldStorageDetailsAlter()
  */
@@ -78,7 +78,7 @@ function _field_test_storage_data($data = NULL) {
 }
 
 /**
- * Implements hook_field_storage_load().
+ * @implements hook_field_storage_load().
  */
 function field_test_field_storage_load($entity_type, $entities, $age, $fields, $options) {
   $data = _field_test_storage_data();
@@ -114,7 +114,7 @@ function field_test_field_storage_load($entity_type, $entities, $age, $fields, $
 }
 
 /**
- * Implements hook_field_storage_write().
+ * @implements hook_field_storage_write().
  */
 function field_test_field_storage_write($entity_type, $entity, $op, $fields) {
   $data = _field_test_storage_data();
@@ -184,7 +184,7 @@ function field_test_field_storage_write($entity_type, $entity, $op, $fields) {
 }
 
 /**
- * Implements hook_field_storage_delete().
+ * @implements hook_field_storage_delete().
  */
 function field_test_field_storage_delete($entity_type, $entity, $fields) {
   list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
@@ -200,7 +200,7 @@ function field_test_field_storage_delete($entity_type, $entity, $fields) {
 }
 
 /**
- * Implements hook_field_storage_purge().
+ * @implements hook_field_storage_purge().
  */
 function field_test_field_storage_purge($entity_type, $entity, $field, $instance) {
   $data = _field_test_storage_data();
@@ -220,7 +220,7 @@ function field_test_field_storage_purge($entity_type, $entity, $field, $instance
 }
 
 /**
- * Implements hook_field_storage_delete_revision().
+ * @implements hook_field_storage_delete_revision().
  */
 function field_test_field_storage_delete_revision($entity_type, $entity, $fields) {
   $data = _field_test_storage_data();
@@ -241,7 +241,7 @@ function field_test_field_storage_delete_revision($entity_type, $entity, $fields
 }
 
 /**
- * Implements hook_field_storage_query().
+ * @implements hook_field_storage_query().
  */
 function field_test_field_storage_query($field_id, $conditions, $count, &$cursor = NULL, $age) {
   $data = _field_test_storage_data();
@@ -365,7 +365,7 @@ function _field_test_field_storage_query_sort_helper($a, $b) {
 }
 
 /**
- * Implements hook_field_storage_create_field().
+ * @implements hook_field_storage_create_field().
  */
 function field_test_field_storage_create_field($field) {
   if ($field['storage']['type'] == 'field_test_storage_failure') {
@@ -383,7 +383,7 @@ function field_test_field_storage_create_field($field) {
 }
 
 /**
- * Implements hook_field_storage_delete_field().
+ * @implements hook_field_storage_delete_field().
  */
 function field_test_field_storage_delete_field($field) {
   $data = _field_test_storage_data();
@@ -399,7 +399,7 @@ function field_test_field_storage_delete_field($field) {
 }
 
 /**
- * Implements hook_field_storage_delete_instance().
+ * @implements hook_field_storage_delete_instance().
  */
 function field_test_field_storage_delete_instance($instance) {
   $data = _field_test_storage_data();
@@ -418,14 +418,14 @@ function field_test_field_storage_delete_instance($instance) {
 }
 
 /**
- * Implements hook_field_attach_create_bundle().
+ * @implements hook_field_attach_create_bundle().
  */
 function field_test_field_attach_create_bundle($bundle) {
   // We don't need to do anything here.
 }
 
 /**
- * Implements hook_field_attach_rename_bundle().
+ * @implements hook_field_attach_rename_bundle().
  */
 function field_test_field_attach_rename_bundle($bundle_old, $bundle_new) {
   $data = _field_test_storage_data();
@@ -450,7 +450,7 @@ function field_test_field_attach_rename_bundle($bundle_old, $bundle_new) {
 }
 
 /**
- * Implements hook_field_attach_delete_bundle().
+ * @implements hook_field_attach_delete_bundle().
  */
 function field_test_field_attach_delete_bundle($entity_type, $bundle, $instances) {
   $data = _field_test_storage_data();
diff --git a/modules/field_ui/field_ui.module b/modules/field_ui/field_ui.module
index 28ac0e1..d282fb0 100644
--- a/modules/field_ui/field_ui.module
+++ b/modules/field_ui/field_ui.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function field_ui_help($path, $arg) {
   switch ($path) {
@@ -48,7 +48,7 @@ function field_ui_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function field_ui_menu() {
   $items['admin/reports/fields'] = array(
@@ -263,7 +263,7 @@ function _field_ui_view_mode_menu_access($entity_type, $bundle, $view_mode, $acc
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function field_ui_theme() {
   return array(
@@ -274,7 +274,7 @@ function field_ui_theme() {
 }
 
 /**
- * Implements hook_element_info().
+ * @implements hook_element_info().
  */
 function field_ui_element_info() {
   return array(
@@ -287,7 +287,7 @@ function field_ui_element_info() {
 }
 
 /**
- * Implements hook_field_attach_create_bundle().
+ * @implements hook_field_attach_create_bundle().
  */
 function field_ui_field_attach_create_bundle($entity_type, $bundle) {
   // When a new bundle is created, the menu needs to be rebuilt to add our
diff --git a/modules/file/file.field.inc b/modules/file/file.field.inc
index 2af3cb6..75dfb08 100644
--- a/modules/file/file.field.inc
+++ b/modules/file/file.field.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_field_info().
+ * @implements hook_field_info().
  */
 function file_field_info() {
   return array(
@@ -31,7 +31,7 @@ function file_field_info() {
 }
 
 /**
- * Implements hook_field_settings_form().
+ * @implements hook_field_settings_form().
  */
 function file_field_settings_form($field, $instance, $has_data) {
   $defaults = field_info_field_settings($field['type']);
@@ -69,7 +69,7 @@ function file_field_settings_form($field, $instance, $has_data) {
 }
 
 /**
- * Implements hook_field_instance_settings_form().
+ * @implements hook_field_instance_settings_form().
  */
 function file_field_instance_settings_form($field, $instance) {
   $settings = $instance['settings'];
@@ -164,7 +164,7 @@ function _file_generic_settings_file_directory_validate($element, &$form_state)
 }
 
 /**
- * Implements hook_field_load().
+ * @implements hook_field_load().
  */
 function file_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
 
@@ -193,7 +193,7 @@ function file_field_load($entity_type, $entities, $field, $instances, $langcode,
 }
 
 /**
- * Implements hook_field_prepare_view().
+ * @implements hook_field_prepare_view().
  */
 function file_field_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items) {
   // Remove files specified to not be displayed.
@@ -209,7 +209,7 @@ function file_field_prepare_view($entity_type, $entities, $field, $instances, $l
 }
 
 /**
- * Implements hook_field_presave().
+ * @implements hook_field_presave().
  */
 function file_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
   // Make sure that each file which will be saved with this object has a
@@ -225,7 +225,7 @@ function file_field_presave($entity_type, $entity, $field, $instance, $langcode,
 }
 
 /**
- * Implements hook_field_insert().
+ * @implements hook_field_insert().
  */
 function file_field_insert($entity_type, $entity, $field, $instance, $langcode, &$items) {
   list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
@@ -238,7 +238,7 @@ function file_field_insert($entity_type, $entity, $field, $instance, $langcode,
 }
 
 /**
- * Implements hook_field_update().
+ * @implements hook_field_update().
  *
  * Checks for files that have been removed from the object.
  */
@@ -287,7 +287,7 @@ function file_field_update($entity_type, $entity, $field, $instance, $langcode,
 }
 
 /**
- * Implements hook_field_delete().
+ * @implements hook_field_delete().
  */
 function file_field_delete($entity_type, $entity, $field, $instance, $langcode, &$items) {
   list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
@@ -299,7 +299,7 @@ function file_field_delete($entity_type, $entity, $field, $instance, $langcode,
 }
 
 /**
- * Implements hook_field_delete_revision().
+ * @implements hook_field_delete_revision().
  */
 function file_field_delete_revision($entity_type, $entity, $field, $instance, $langcode, &$items) {
   list($id, $vid, $bundle) = entity_extract_ids($entity_type, $entity);
@@ -351,7 +351,7 @@ function file_field_delete_file($item, $field, $entity_type, $id, $count = 1) {
 }
 
 /**
- * Implements hook_field_is_empty().
+ * @implements hook_field_is_empty().
  */
 function file_field_is_empty($item, $field) {
   return empty($item['fid']);
@@ -375,7 +375,7 @@ function file_field_displayed($item, $field) {
 }
 
 /**
- * Implements hook_field_formatter_info().
+ * @implements hook_field_formatter_info().
  */
 function file_field_formatter_info() {
   return array(
@@ -395,7 +395,7 @@ function file_field_formatter_info() {
 }
 
 /**
- * Implements hook_field_widget_info().
+ * @implements hook_field_widget_info().
  */
 function file_field_widget_info() {
   return array(
@@ -414,7 +414,7 @@ function file_field_widget_info() {
 }
 
 /**
- * Implements hook_field_widget_settings_form().
+ * @implements hook_field_widget_settings_form().
  */
 function file_field_widget_settings_form($field, $instance) {
   $widget = $instance['widget'];
@@ -437,7 +437,7 @@ function file_field_widget_settings_form($field, $instance) {
 }
 
 /**
- * Implements hook_field_widget_form().
+ * @implements hook_field_widget_form().
  */
 function file_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
 
@@ -938,7 +938,7 @@ function theme_file_upload_help($variables) {
 }
 
 /**
- * Implements hook_field_formatter_view().
+ * @implements hook_field_formatter_view().
  */
 function file_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
diff --git a/modules/file/file.install b/modules/file/file.install
index 47ee4fd..077559e 100644
--- a/modules/file/file.install
+++ b/modules/file/file.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_field_schema().
+ * @implements hook_field_schema().
  */
 function file_field_schema($field) {
   return array(
@@ -44,7 +44,7 @@ function file_field_schema($field) {
 }
 
 /**
- * Implements hook_requirements().
+ * @implements hook_requirements().
  *
  * Display information about getting upload progress bars working.
  */
diff --git a/modules/file/file.module b/modules/file/file.module
index 4002701..b8c88f2 100644
--- a/modules/file/file.module
+++ b/modules/file/file.module
@@ -9,7 +9,7 @@
 require_once DRUPAL_ROOT . '/modules/file/file.field.inc';
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function file_help($path, $arg) {
   switch ($path) {
@@ -31,7 +31,7 @@ function file_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function file_menu() {
   $items = array();
@@ -55,7 +55,7 @@ function file_menu() {
 }
 
 /**
- * Implements hook_element_info().
+ * @implements hook_element_info().
  *
  * The managed file element may be used independently anywhere in Drupal.
  */
@@ -83,7 +83,7 @@ function file_element_info() {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function file_theme() {
   return array(
@@ -115,7 +115,7 @@ function file_theme() {
 }
 
 /**
- * Implements hook_file_download().
+ * @implements hook_file_download().
  *
  * This function takes an extra parameter $field_type so that it may
  * be re-used by other File-like modules, such as Image.
@@ -339,7 +339,7 @@ function file_progress_implementation() {
 }
 
 /**
- * Implements hook_file_delete().
+ * @implements hook_file_delete().
  */
 function file_file_delete($file) {
   // TODO: Remove references to a file that is in-use.
diff --git a/modules/file/tests/file_module_test.module b/modules/file/tests/file_module_test.module
index ea65981..0e4deab 100644
--- a/modules/file/tests/file_module_test.module
+++ b/modules/file/tests/file_module_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function file_module_test_menu() {
   $items = array();
diff --git a/modules/filter/filter.install b/modules/filter/filter.install
index da9ecb8..6a0ab21 100644
--- a/modules/filter/filter.install
+++ b/modules/filter/filter.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function filter_schema() {
   $schema['filter'] = array(
@@ -112,7 +112,7 @@ function filter_schema() {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function filter_install() {
   // All sites require at least one text format (the fallback format) that all
diff --git a/modules/filter/filter.module b/modules/filter/filter.module
index 66fadcb..c771fea 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function filter_help($path, $arg) {
   switch ($path) {
@@ -39,7 +39,7 @@ function filter_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function filter_theme() {
   return array(
@@ -68,7 +68,7 @@ function filter_theme() {
 }
 
 /**
- * Implements hook_element_info().
+ * @implements hook_element_info().
  *
  * @see filter_process_format()
  */
@@ -82,7 +82,7 @@ function filter_element_info() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function filter_menu() {
   $items['filter/tips'] = array(
@@ -318,7 +318,7 @@ function filter_admin_format_title($format) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function filter_permission() {
   $perms['administer filters'] = array(
@@ -360,7 +360,7 @@ function filter_permission_name($format) {
 }
 
 /**
- * Implements hook_modules_enabled().
+ * @implements hook_modules_enabled().
  */
 function filter_modules_enabled($modules) {
   // Reset the static cache of module-provided filters, in case any of the
@@ -369,7 +369,7 @@ function filter_modules_enabled($modules) {
 }
 
 /**
- * Implements hook_modules_disabled().
+ * @implements hook_modules_disabled().
  */
 function filter_modules_disabled($modules) {
   // Reset the static cache of module-provided filters, in case any of the
@@ -1147,7 +1147,7 @@ function theme_filter_guidelines($variables) {
  */
 
 /**
- * Implements hook_filter_info().
+ * @implements hook_filter_info().
  */
 function filter_filter_info() {
   $filters['filter_html'] = array(
diff --git a/modules/forum/forum.install b/modules/forum/forum.install
index 066b476..a5caaa1 100644
--- a/modules/forum/forum.install
+++ b/modules/forum/forum.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function forum_install() {
   // Set the weight of the forum.module to 1 so it is loaded after the taxonomy.module.
@@ -20,7 +20,7 @@ function forum_install() {
 }
 
 /**
- * Implements hook_enable().
+ * @implements hook_enable().
  */
 function forum_enable() {
   // If we enable forum at the same time as taxonomy we need to call
@@ -102,7 +102,7 @@ function forum_enable() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function forum_uninstall() {
   // Load the dependent Taxonomy module, in case it has been disabled.
@@ -118,7 +118,7 @@ function forum_uninstall() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function forum_schema() {
   $schema['forum'] = array(
@@ -236,7 +236,7 @@ function forum_schema() {
 }
 
 /**
- * Implements hook_update_last_removed().
+ * @implements hook_update_last_removed().
  */
 function forum_update_last_removed() {
   return 7002;
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index c58b5c9..c0af495 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function forum_help($path, $arg) {
   switch ($path) {
@@ -52,7 +52,7 @@ function forum_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function forum_theme() {
   return array(
@@ -84,7 +84,7 @@ function forum_theme() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function forum_menu() {
   $items['forum'] = array(
@@ -159,7 +159,7 @@ function forum_menu() {
 }
 
 /**
- * Implements hook_menu_local_tasks_alter().
+ * @implements hook_menu_local_tasks_alter().
  */
 function forum_menu_local_tasks_alter(&$data, $router_item, $root_path) {
   global $user;
@@ -212,7 +212,7 @@ function forum_menu_local_tasks_alter(&$data, $router_item, $root_path) {
 }
 
 /**
- * Implements hook_entity_info_alter().
+ * @implements hook_entity_info_alter().
  */
 function forum_entity_info_alter(&$info) {
   // Take over URI constuction for taxonomy terms that are forums.
@@ -258,7 +258,7 @@ function _forum_node_check_node_type($node) {
 }
 
 /**
- * Implements hook_node_view().
+ * @implements hook_node_view().
  */
 function forum_node_view($node, $view_mode) {
   $vid = variable_get('forum_nav_vocabulary', 0);
@@ -281,7 +281,7 @@ function forum_node_view($node, $view_mode) {
 }
 
 /**
- * Implements hook_node_validate().
+ * @implements hook_node_validate().
  *
  * Check in particular that only a "leaf" term in the associated taxonomy.
  */
@@ -317,7 +317,7 @@ function forum_node_validate($node, $form) {
 }
 
 /**
- * Implements hook_node_presave().
+ * @implements hook_node_presave().
  *
  * Assign forum taxonomy when adding a topic from within a forum.
  */
@@ -339,7 +339,7 @@ function forum_node_presave($node) {
 }
 
 /**
- * Implements hook_node_update().
+ * @implements hook_node_update().
  */
 function forum_node_update($node) {
   if (_forum_node_check_node_type($node)) {
@@ -387,7 +387,7 @@ function forum_node_update($node) {
 }
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function forum_node_insert($node) {
   if (_forum_node_check_node_type($node)) {
@@ -404,7 +404,7 @@ function forum_node_insert($node) {
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function forum_node_delete($node) {
   if (_forum_node_check_node_type($node)) {
@@ -418,7 +418,7 @@ function forum_node_delete($node) {
 }
 
 /**
- * Implements hook_node_load().
+ * @implements hook_node_load().
  */
 function forum_node_load($nodes) {
   $node_vids = array();
@@ -440,7 +440,7 @@ function forum_node_load($nodes) {
 }
 
 /**
- * Implements hook_node_info().
+ * @implements hook_node_info().
  */
 function forum_node_info() {
   return array(
@@ -454,7 +454,7 @@ function forum_node_info() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function forum_permission() {
   $perms = array(
@@ -466,7 +466,7 @@ function forum_permission() {
 }
 
 /**
- * Implements hook_taxonomy_term_delete().
+ * @implements hook_taxonomy_term_delete().
  */
 function forum_taxonomy_term_delete($tid) {
   // For containers, remove the tid from the forum_containers variable.
@@ -479,7 +479,7 @@ function forum_taxonomy_term_delete($tid) {
 }
 
 /**
- * Implements hook_comment_publish().
+ * @implements hook_comment_publish().
  *
  * This actually handles the insert and update of published nodes since
  * comment_save() calls hook_comment_publish() for all published comments.
@@ -489,7 +489,7 @@ function forum_comment_publish($comment) {
 }
 
 /**
- * Implements hook_comment_update().
+ * @implements hook_comment_update().
  *
  * Comment module doesn't call hook_comment_unpublish() when saving individual
  * comments so we need to check for those here.
@@ -503,21 +503,21 @@ function forum_comment_update($comment) {
 }
 
 /**
- * Implements hook_comment_unpublish().
+ * @implements hook_comment_unpublish().
  */
 function forum_comment_unpublish($comment) {
   _forum_update_forum_index($comment->nid);
 }
 
 /**
- * Implements hook_comment_delete().
+ * @implements hook_comment_delete().
  */
 function forum_comment_delete($comment) {
   _forum_update_forum_index($comment->nid);
 }
 
 /**
- * Implements hook_field_storage_pre_insert().
+ * @implements hook_field_storage_pre_insert().
  */
 function forum_field_storage_pre_insert($entity_type, $entity, &$skip_fields) {
   if ($entity_type == 'node' && $entity->status && _forum_node_check_node_type($entity)) {
@@ -540,7 +540,7 @@ function forum_field_storage_pre_insert($entity_type, $entity, &$skip_fields) {
 }
 
 /**
- * Implements hook_field_storage_pre_update().
+ * @implements hook_field_storage_pre_update().
  */
 function forum_field_storage_pre_update($entity_type, $entity, &$skip_fields) {
   $first_call = &drupal_static(__FUNCTION__, array());
@@ -578,7 +578,7 @@ function forum_field_storage_pre_update($entity_type, $entity, &$skip_fields) {
 }
 
 /**
- * Implements hook_form_alter().
+ * @implements hook_form_alter().
  */
 function forum_form_alter(&$form, $form_state, $form_id) {
   $vid = variable_get('forum_nav_vocabulary', 0);
@@ -613,7 +613,7 @@ function forum_form_alter(&$form, $form_state, $form_id) {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function forum_block_info() {
   $blocks['active'] = array(
@@ -630,7 +630,7 @@ function forum_block_info() {
 }
 
 /**
- * Implements hook_block_configure().
+ * @implements hook_block_configure().
  */
 function forum_block_configure($delta = '') {
   $form['forum_block_num_' . $delta] = array('#type' => 'select', '#title' => t('Number of topics'), '#default_value' => variable_get('forum_block_num_' . $delta, '5'), '#options' => drupal_map_assoc(array(2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20)));
@@ -638,14 +638,14 @@ function forum_block_configure($delta = '') {
 }
 
 /**
- * Implements hook_block_save().
+ * @implements hook_block_save().
  */
 function forum_block_save($delta = '', $edit = array()) {
   variable_set('forum_block_num_' . $delta, $edit['forum_block_num_' . $delta]);
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  *
  * Generates a block containing the currently active forum topics and the
  * most recently added forum topics.
@@ -695,7 +695,7 @@ function forum_block_view_pre_render($elements) {
 }
 
 /**
- * Implements hook_form().
+ * @implements hook_form().
  */
 function forum_form($node, $form_state) {
   $type = node_type_get_type($node);
@@ -1265,7 +1265,7 @@ function _forum_update_forum_index($nid) {
 }
 
 /**
- * Implements hook_rdf_mapping().
+ * @implements hook_rdf_mapping().
  */
 function forum_rdf_mapping() {
   return array(
diff --git a/modules/help/help.module b/modules/help/help.module
index 773a52d..ab095ee 100644
--- a/modules/help/help.module
+++ b/modules/help/help.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function help_menu() {
   $items['admin/help'] = array(
@@ -33,7 +33,7 @@ function help_menu() {
 }
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function help_help($path, $arg) {
   switch ($path) {
diff --git a/modules/image/image.effects.inc b/modules/image/image.effects.inc
index 122af6c..cf988be 100644
--- a/modules/image/image.effects.inc
+++ b/modules/image/image.effects.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_image_effect_info().
+ * @implements hook_image_effect_info().
  */
 function image_image_effect_info() {
   $effects = array(
diff --git a/modules/image/image.field.inc b/modules/image/image.field.inc
index 07cc1e0..12874b7 100644
--- a/modules/image/image.field.inc
+++ b/modules/image/image.field.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_field_info().
+ * @implements hook_field_info().
  */
 function image_field_info() {
   return array(
@@ -33,7 +33,7 @@ function image_field_info() {
 }
 
 /**
- * Implements hook_field_settings_form().
+ * @implements hook_field_settings_form().
  */
 function image_field_settings_form($field, $instance) {
   $defaults = field_info_field_settings($field['type']);
@@ -64,7 +64,7 @@ function image_field_settings_form($field, $instance) {
 }
 
 /**
- * Implements hook_field_instance_settings_form().
+ * @implements hook_field_instance_settings_form().
  */
 function image_field_instance_settings_form($field, $instance) {
   $settings = $instance['settings'];
@@ -177,14 +177,14 @@ function _image_field_resolution_validate($element, &$form_state) {
 }
 
 /**
- * Implements hook_field_load().
+ * @implements hook_field_load().
  */
 function image_field_load($entity_type, $entities, $field, $instances, $langcode, &$items, $age) {
   file_field_load($entity_type, $entities, $field, $instances, $langcode, $items, $age);
 }
 
 /**
- * Implements hook_field_prepare_view().
+ * @implements hook_field_prepare_view().
  */
 function image_field_prepare_view($entity_type, $entities, $field, $instances, $langcode, &$items) {
   // If there are no files specified at all, use the default.
@@ -202,49 +202,49 @@ function image_field_prepare_view($entity_type, $entities, $field, $instances, $
 }
 
 /**
- * Implements hook_field_presave().
+ * @implements hook_field_presave().
  */
 function image_field_presave($entity_type, $entity, $field, $instance, $langcode, &$items) {
   file_field_presave($entity_type, $entity, $field, $instance, $langcode, $items);
 }
 
 /**
- * Implements hook_field_insert().
+ * @implements hook_field_insert().
  */
 function image_field_insert($entity_type, $entity, $field, $instance, $langcode, &$items) {
   file_field_insert($entity_type, $entity, $field, $instance, $langcode, $items);
 }
 
 /**
- * Implements hook_field_update().
+ * @implements hook_field_update().
  */
 function image_field_update($entity_type, $entity, $field, $instance, $langcode, &$items) {
   file_field_update($entity_type, $entity, $field, $instance, $langcode, $items);
 }
 
 /**
- * Implements hook_field_delete().
+ * @implements hook_field_delete().
  */
 function image_field_delete($entity_type, $entity, $field, $instance, $langcode, &$items) {
   file_field_delete($entity_type, $entity, $field, $instance, $langcode, $items);
 }
 
 /**
- * Implements hook_field_delete_revision().
+ * @implements hook_field_delete_revision().
  */
 function image_field_delete_revision($entity_type, $entity, $field, $instance, $langcode, &$items) {
   file_field_delete_revision($entity_type, $entity, $field, $instance, $langcode, $items);
 }
 
 /**
- * Implements hook_field_is_empty().
+ * @implements hook_field_is_empty().
  */
 function image_field_is_empty($item, $field) {
   return file_field_is_empty($item, $field);
 }
 
 /**
- * Implements hook_field_widget_info().
+ * @implements hook_field_widget_info().
  */
 function image_field_widget_info() {
   return array(
@@ -264,7 +264,7 @@ function image_field_widget_info() {
 }
 
 /**
- * Implements hook_field_widget_settings_form().
+ * @implements hook_field_widget_settings_form().
  */
 function image_field_widget_settings_form($field, $instance) {
   $widget = $instance['widget'];
@@ -287,7 +287,7 @@ function image_field_widget_settings_form($field, $instance) {
 }
 
 /**
- * Implements hook_field_widget_form().
+ * @implements hook_field_widget_form().
  */
 function image_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
 
@@ -405,7 +405,7 @@ function theme_image_widget($variables) {
 }
 
 /**
- * Implements hook_field_formatter_info().
+ * @implements hook_field_formatter_info().
  */
 function image_field_formatter_info() {
   $formatters = array(
@@ -420,7 +420,7 @@ function image_field_formatter_info() {
 }
 
 /**
- * Implements hook_field_formatter_settings_form().
+ * @implements hook_field_formatter_settings_form().
  */
 function image_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
   $display = $instance['display'][$view_mode];
@@ -451,7 +451,7 @@ function image_field_formatter_settings_form($field, $instance, $view_mode, $for
 }
 
 /**
- * Implements hook_field_formatter_settings_summary().
+ * @implements hook_field_formatter_settings_summary().
  */
 function image_field_formatter_settings_summary($field, $instance, $view_mode) {
   $display = $instance['display'][$view_mode];
@@ -484,7 +484,7 @@ function image_field_formatter_settings_summary($field, $instance, $view_mode) {
 }
 
 /**
- * Implements hook_field_formatter_view().
+ * @implements hook_field_formatter_view().
  */
 function image_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
diff --git a/modules/image/image.install b/modules/image/image.install
index 121e8c7..d9f1313 100644
--- a/modules/image/image.install
+++ b/modules/image/image.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function image_install() {
   // Create the styles directory and ensure it's writable.
@@ -15,7 +15,7 @@ function image_install() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function image_uninstall() {
   // Remove the styles directory and generated images.
@@ -23,7 +23,7 @@ function image_uninstall() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function image_schema() {
   $schema = array();
@@ -107,7 +107,7 @@ function image_schema() {
 }
 
 /**
- * Implements hook_field_schema().
+ * @implements hook_field_schema().
  */
 function image_field_schema($field) {
   return array(
@@ -144,7 +144,7 @@ function image_field_schema($field) {
 }
 
 /**
- * Implements hook_requirements() to check the PHP GD Library.
+ * @implements hook_requirements() to check the PHP GD Library.
  *
  * @param $phase
  */
diff --git a/modules/image/image.module b/modules/image/image.module
index d2d081c..c4712b5 100644
--- a/modules/image/image.module
+++ b/modules/image/image.module
@@ -65,7 +65,7 @@ function image_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function image_menu() {
   $items = array();
@@ -176,7 +176,7 @@ function image_menu() {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function image_theme() {
   return array(
@@ -228,7 +228,7 @@ function image_theme() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function image_permission() {
   return array(
@@ -240,7 +240,7 @@ function image_permission() {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function image_form_system_file_system_settings_alter(&$form, &$form_state) {
   $form['#submit'][] = 'image_system_file_system_settings_submit';
@@ -259,14 +259,14 @@ function image_system_file_system_settings_submit($form, &$form_state) {
 }
 
 /**
- * Implements hook_flush_caches().
+ * @implements hook_flush_caches().
  */
 function image_flush_caches() {
   return array('cache_image');
 }
 
 /**
- * Implements hook_file_download().
+ * @implements hook_file_download().
  *
  * Control the access to files underneath the styles directory.
  */
@@ -320,7 +320,7 @@ function image_file_download($uri) {
 }
 
 /**
- * Implements hook_file_move().
+ * @implements hook_file_move().
  */
 function image_file_move($file, $source) {
   // Delete any image derivatives at the original image path.
@@ -328,7 +328,7 @@ function image_file_move($file, $source) {
 }
 
 /**
- * Implements hook_file_delete().
+ * @implements hook_file_delete().
  */
 function image_file_delete($file) {
   // Delete any image derivatives of this image.
@@ -336,7 +336,7 @@ function image_file_delete($file) {
 }
 
 /**
- * Implements hook_image_default_styles().
+ * @implements hook_image_default_styles().
  */
 function image_image_default_styles() {
   $styles = array();
@@ -375,7 +375,7 @@ function image_image_default_styles() {
 }
 
 /**
- * Implements hook_image_style_save().
+ * @implements hook_image_style_save().
  */
 function image_image_style_save($style) {
   if (isset($style['old_name']) && $style['old_name'] != $style['name']) {
@@ -406,7 +406,7 @@ function image_image_style_save($style) {
 }
 
 /**
- * Implements hook_image_style_delete().
+ * @implements hook_image_style_delete().
  */
 function image_image_style_delete($style) {
   image_image_style_save($style);
diff --git a/modules/locale/locale.install b/modules/locale/locale.install
index a144813..7528b3c 100644
--- a/modules/locale/locale.install
+++ b/modules/locale/locale.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function locale_install() {
   // locales_source.source and locales_target.target are not used as binary
@@ -27,7 +27,7 @@ function locale_install() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function locale_uninstall() {
   // Delete all JavaScript translation files.
@@ -77,7 +77,7 @@ function locale_uninstall() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function locale_schema() {
   $schema['languages'] = array(
diff --git a/modules/locale/locale.module b/modules/locale/locale.module
index c1cdd43..d5ddafa 100644
--- a/modules/locale/locale.module
+++ b/modules/locale/locale.module
@@ -15,7 +15,7 @@
 // Hook implementations
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function locale_help($path, $arg) {
   switch ($path) {
@@ -68,7 +68,7 @@ function locale_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function locale_menu() {
   // Manage languages
@@ -219,7 +219,7 @@ function locale_menu() {
 }
 
 /**
- * Implements hook_init().
+ * @implements hook_init().
  *
  * Initialize date formats according to the user's current locale.
  */
@@ -244,7 +244,7 @@ function locale_init() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function locale_permission() {
   return array(
@@ -258,7 +258,7 @@ function locale_permission() {
 }
 
 /**
- * Implements hook_locale().
+ * @implements hook_locale().
  */
 function locale_locale($op = 'groups') {
   switch ($op) {
@@ -305,7 +305,7 @@ function locale_language_selector_form(&$form, &$form_state, $user) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function locale_form_path_admin_form_alter(&$form, &$form_state) {
   $form['language'] = array(
@@ -319,7 +319,7 @@ function locale_form_path_admin_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function locale_form_node_type_form_alter(&$form, &$form_state) {
   if (isset($form['type'])) {
@@ -344,7 +344,7 @@ function locale_multilingual_node_type($type_name) {
 }
 
 /**
- * Implements hook_form_alter().
+ * @implements hook_form_alter().
  *
  * Adds language fields to user forms.
  */
@@ -360,7 +360,7 @@ function locale_form_alter(&$form, &$form_state, $form_id) {
 }
 
 /**
- * Implements hook_form_BASE_FORM_ID_alter().
+ * @implements hook_form_BASE_FORM_ID_alter().
  */
 function locale_form_node_form_alter(&$form, &$form_state) {
   if (isset($form['#node']->type) && locale_multilingual_node_type($form['#node']->type)) {
@@ -414,7 +414,7 @@ function locale_field_node_form_submit($form, &$form_state) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function locale_theme() {
   return array(
@@ -431,7 +431,7 @@ function locale_theme() {
 }
 
 /**
- * Implements hook_field_language_alter().
+ * @implements hook_field_language_alter().
  */
 function locale_field_language_alter(&$display_language, $context) {
   // Do not apply core language fallback rules if they are disabled or if Locale
@@ -486,14 +486,14 @@ function locale_field_language_fallback(&$display_language, $entity, $langcode)
 }
 
 /**
- * Implements hook_entity_info_alter().
+ * @implements hook_entity_info_alter().
  */
 function locale_entity_info_alter(&$entity_info) {
   $entity_info['node']['translation']['locale'] = TRUE;
 }
 
 /**
- * Implements hook_language_types_info().
+ * @implements hook_language_types_info().
  *
  * Defines the three core language types:
  * - Interface language is the only configurable language type in core. It is
@@ -522,7 +522,7 @@ function locale_language_types_info() {
 }
 
 /**
- * Implements hook_language_negotiation_info().
+ * @implements hook_language_negotiation_info().
  */
 function locale_language_negotiation_info() {
   $file = 'includes/locale.inc';
@@ -772,14 +772,14 @@ function locale_language_list($field = 'name', $all = FALSE) {
 }
 
 /**
- * Implements hook_modules_installed().
+ * @implements hook_modules_installed().
  */
 function locale_modules_installed($modules) {
   locale_system_update($modules);
 }
 
 /**
- * Implements hook_themes_enabled().
+ * @implements hook_themes_enabled().
  *
  * @todo This is technically wrong. We must not import upon enabling, but upon
  *   initial installation. The theme system is missing an installation hook.
@@ -806,7 +806,7 @@ function locale_system_update($components) {
 }
 
 /**
- * Implements hook_js_alter().
+ * @implements hook_js_alter().
  *
  * This function checks all JavaScript files currently added via drupal_add_js()
  * and invokes parsing if they have not yet been parsed for Drupal.t()
@@ -870,7 +870,7 @@ function locale_js_alter(&$javascript) {
 }
 
 /**
- * Implements hook_css_alter().
+ * @implements hook_css_alter().
  *
  * This function checks all CSS files currently added via drupal_add_css() and
  * and checks to see if a related right to left CSS file should be included.
@@ -922,7 +922,7 @@ function locale_library_alter(&$libraries, $module) {
 // Language switcher block
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function locale_block_info() {
   include_once DRUPAL_ROOT . '/includes/language.inc';
@@ -939,7 +939,7 @@ function locale_block_info() {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  *
  * Displays a language switcher. Only show if we have at least two languages.
  */
@@ -960,7 +960,7 @@ function locale_block_view($type) {
 }
 
 /**
- * Implements hook_url_outbound_alter().
+ * @implements hook_url_outbound_alter().
  *
  * Rewrite outbound URLs with language based prefixes.
  */
@@ -1008,7 +1008,7 @@ function locale_url_outbound_alter(&$path, &$options, $original_path) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function locale_form_comment_form_alter(&$form, &$form_state, $form_id) {
   // If a content type has multilingual support we set the content language as
diff --git a/modules/locale/tests/locale_test.module b/modules/locale/tests/locale_test.module
index f256b5c..c4d3030 100644
--- a/modules/locale/tests/locale_test.module
+++ b/modules/locale/tests/locale_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_locale().
+ * @implements hook_locale().
  */
 function locale_test_locale($op = 'groups') {
   switch ($op) {
@@ -16,7 +16,7 @@ function locale_test_locale($op = 'groups') {
 }
 
 /**
- * Implements hook_boot().
+ * @implements hook_boot().
  *
  * For testing domain language negotiation, we fake it by setting
  * the HTTP_HOST here
@@ -28,7 +28,7 @@ function locale_test_boot() {
 }
 
 /**
- * Implements hook_language_types_info_alter().
+ * @implements hook_language_types_info_alter().
  */
 function locale_test_language_types_info_alter(array &$language_types) {
   if (variable_get('locale_test_content_language_type', FALSE)) {
diff --git a/modules/menu/menu.install b/modules/menu/menu.install
index 05aed28..46599b1 100644
--- a/modules/menu/menu.install
+++ b/modules/menu/menu.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function menu_schema() {
   $schema['menu_custom'] = array(
@@ -41,7 +41,7 @@ function menu_schema() {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function menu_install() {
   $system_menus = menu_list_system_menus();
@@ -63,7 +63,7 @@ function menu_install() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function menu_uninstall() {
   menu_rebuild();
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 3edf158..b27a5de 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -18,7 +18,7 @@
 define('MENU_MAX_MENU_NAME_LENGTH_UI', 27);
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function menu_help($path, $arg) {
   switch ($path) {
@@ -43,7 +43,7 @@ function menu_help($path, $arg) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function menu_permission() {
   return array(
@@ -54,7 +54,7 @@ function menu_permission() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function menu_menu() {
   $items['admin/structure/menu'] = array(
@@ -157,7 +157,7 @@ function menu_menu() {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function menu_theme() {
   return array(
@@ -173,7 +173,7 @@ function menu_theme() {
 }
 
 /**
- * Implements hook_enable().
+ * @implements hook_enable().
  *
  * Add a link for each custom menu.
  */
@@ -437,7 +437,7 @@ function menu_reset_item($link) {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function menu_block_info() {
   $menus = menu_get_menus(FALSE);
@@ -454,7 +454,7 @@ function menu_block_info() {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  */
 function menu_block_view($delta = '') {
   $menus = menu_get_menus(FALSE);
@@ -468,7 +468,7 @@ function menu_block_view($delta = '') {
 }
 
 /**
- * Implements hook_block_view_alter().
+ * @implements hook_block_view_alter().
  */
 function menu_block_view_alter(&$data, $block) {
   // Add contextual links for system menu blocks.
@@ -481,14 +481,14 @@ function menu_block_view_alter(&$data, $block) {
 }
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function menu_node_insert($node) {
   menu_node_save($node);
 }
 
 /**
- * Implements hook_node_update().
+ * @implements hook_node_update().
  */
 function menu_node_update($node) {
   menu_node_save($node);
@@ -524,7 +524,7 @@ function menu_node_save($node) {
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function menu_node_delete($node) {
   // Delete all menu module links that point to this node.
@@ -535,7 +535,7 @@ function menu_node_delete($node) {
 }
 
 /**
- * Implements hook_node_prepare().
+ * @implements hook_node_prepare().
  */
 function menu_node_prepare($node) {
   if (empty($node->menu)) {
@@ -587,7 +587,7 @@ function _menu_parent_depth_limit($item) {
 }
 
 /**
- * Implements hook_form_BASE_FORM_ID_alter().
+ * @implements hook_form_BASE_FORM_ID_alter().
  *
  * Adds menu item fields to the node form.
  *
@@ -674,7 +674,7 @@ function menu_form_node_form_alter(&$form, $form_state) {
 }
 
 /**
- * Implements hook_node_submit().
+ * @implements hook_node_submit().
  *
  * @see menu_form_node_form_alter()
  */
@@ -687,7 +687,7 @@ function menu_node_submit($node, $form, $form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  *
  * Adds menu options to the node type form.
  */
diff --git a/modules/node/content_types.inc b/modules/node/content_types.inc
index ab4b2e6..84a53bd 100644
--- a/modules/node/content_types.inc
+++ b/modules/node/content_types.inc
@@ -269,7 +269,7 @@ function node_type_form_validate($form, &$form_state) {
 }
 
 /**
- * Implements hook_form_submit().
+ * @implements hook_form_submit().
  */
 function node_type_form_submit($form, &$form_state) {
   $op = isset($form_state['values']['op']) ? $form_state['values']['op'] : '';
@@ -350,7 +350,7 @@ function node_type_form_submit($form, &$form_state) {
 }
 
 /**
- * Implements hook_node_type_insert().
+ * @implements hook_node_type_insert().
  */
 function node_node_type_insert($info) {
   if (!empty($info->old_type) && $info->old_type != $info->type) {
@@ -363,7 +363,7 @@ function node_node_type_insert($info) {
 }
 
 /**
- * Implements hook_node_type_update().
+ * @implements hook_node_type_update().
  */
 function node_node_type_update($info) {
   if (!empty($info->old_type) && $info->old_type != $info->type) {
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc
index a6ea1b5..859c39e 100644
--- a/modules/node/node.admin.inc
+++ b/modules/node/node.admin.inc
@@ -22,7 +22,7 @@ function node_configure_rebuild_confirm_submit($form, &$form_state) {
 }
 
 /**
- * Implements hook_node_operations().
+ * @implements hook_node_operations().
  */
 function node_node_operations() {
   $operations = array(
diff --git a/modules/node/node.install b/modules/node/node.install
index 4a02baa..66288bd 100644
--- a/modules/node/node.install
+++ b/modules/node/node.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function node_schema() {
   $schema['node'] = array(
@@ -427,7 +427,7 @@ function node_schema() {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function node_install() {
   // Populate the node access table.
diff --git a/modules/node/node.module b/modules/node/node.module
index a002e24..f7e0506 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -60,7 +60,7 @@ define('NODE_ACCESS_DENY', 'deny');
 define('NODE_ACCESS_IGNORE', NULL);
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function node_help($path, $arg) {
   // Remind site administrators about the {node_access} table being flagged
@@ -120,7 +120,7 @@ function node_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function node_theme() {
   return array(
@@ -152,7 +152,7 @@ function node_theme() {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  */
 function node_cron() {
   db_delete('history')
@@ -161,7 +161,7 @@ function node_cron() {
 }
 
 /**
- * Implements hook_entity_info().
+ * @implements hook_entity_info().
  */
 function node_entity_info() {
   $return = array(
@@ -232,7 +232,7 @@ function node_entity_info() {
 }
 
 /**
- * Implements hook_field_display_ENTITY_TYPE_alter().
+ * @implements hook_field_display_ENTITY_TYPE_alter().
  */
 function node_field_display_node_alter(&$display, $context) {
   // Hide field labels in search index.
@@ -251,7 +251,7 @@ function node_uri($node) {
 }
 
 /**
- * Implements hook_admin_paths().
+ * @implements hook_admin_paths().
  */
 function node_admin_paths() {
   if (variable_get('node_admin_theme')) {
@@ -587,7 +587,7 @@ function node_add_body_field($type, $label = 'Body') {
 }
 
 /**
- * Implements hook_field_extra_fields().
+ * @implements hook_field_extra_fields().
  */
 function node_field_extra_fields() {
   $extra = array();
@@ -798,7 +798,7 @@ function node_type_set_defaults($info = array()) {
 }
 
 /**
- * Implements hook_rdf_mapping().
+ * @implements hook_rdf_mapping().
  */
 function node_rdf_mapping() {
   return array(
@@ -1502,7 +1502,7 @@ function template_preprocess_node(&$variables) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function node_permission() {
   $perms = array(
@@ -1570,7 +1570,7 @@ function _node_rankings(SelectQueryExtender $query) {
 }
 
 /**
- * Implements hook_search_info().
+ * @implements hook_search_info().
  */
 function node_search_info() {
   return array(
@@ -1580,14 +1580,14 @@ function node_search_info() {
 }
 
 /**
- * Implements hook_search_access().
+ * @implements hook_search_access().
  */
 function node_search_access() {
   return user_access('access content');
 }
 
 /**
- * Implements hook_search_reset().
+ * @implements hook_search_reset().
  */
 function node_search_reset() {
   db_update('search_dataset')
@@ -1597,7 +1597,7 @@ function node_search_reset() {
 }
 
 /**
- * Implements hook_search_status().
+ * @implements hook_search_status().
  */
 function node_search_status() {
   $total = db_query('SELECT COUNT(*) FROM {node}')->fetchField();
@@ -1606,7 +1606,7 @@ function node_search_status() {
 }
 
 /**
- * Implements hook_search_admin().
+ * @implements hook_search_admin().
  */
 function node_search_admin() {
   // Output form for defining rank factor weights.
@@ -1633,7 +1633,7 @@ function node_search_admin() {
 }
 
 /**
- * Implements hook_search_execute().
+ * @implements hook_search_execute().
  */
 function node_search_execute($keys = NULL, $conditions = NULL) {
   // Build matching conditions
@@ -1693,7 +1693,7 @@ function node_search_execute($keys = NULL, $conditions = NULL) {
 }
 
 /**
- * Implements hook_ranking().
+ * @implements hook_ranking().
  */
 function node_ranking() {
   // Create the ranking array and add the basic ranking options.
@@ -1728,7 +1728,7 @@ function node_ranking() {
 }
 
 /**
- * Implements hook_user_cancel().
+ * @implements hook_user_cancel().
  */
 function node_user_cancel($edit, $account, $method) {
   switch ($method) {
@@ -1766,7 +1766,7 @@ function node_user_cancel($edit, $account, $method) {
 }
 
 /**
- * Implements hook_user_delete().
+ * @implements hook_user_delete().
  */
 function node_user_delete($account) {
   // Delete nodes (current revisions).
@@ -1867,7 +1867,7 @@ function _node_add_access() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function node_menu() {
   $items['admin/content'] = array(
@@ -2048,7 +2048,7 @@ function node_menu() {
 }
 
 /**
- * Implements hook_menu_local_tasks_alter().
+ * @implements hook_menu_local_tasks_alter().
  */
 function node_menu_local_tasks_alter(&$data, $router_item, $root_path) {
   // Add action link to 'node/add' on 'admin/content' page.
@@ -2095,7 +2095,7 @@ function node_revision_list($node) {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function node_block_info() {
   $blocks['syndicate']['info'] = t('Syndicate');
@@ -2109,7 +2109,7 @@ function node_block_info() {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  */
 function node_block_view($delta = '') {
   $block = array();
@@ -2137,7 +2137,7 @@ function node_block_view($delta = '') {
 }
 
 /**
- * Implements hook_block_configure().
+ * @implements hook_block_configure().
  */
 function node_block_configure($delta = '') {
   $form = array();
@@ -2153,7 +2153,7 @@ function node_block_configure($delta = '') {
 }
 
 /**
- * Implements hook_block_save().
+ * @implements hook_block_save().
  */
 function node_block_save($delta = '', $edit = array()) {
   if ($delta == 'recent') {
@@ -2266,7 +2266,7 @@ function theme_node_recent_content($variables) {
 }
 
 /**
- * Implements hook_form_FORMID_alter().
+ * @implements hook_form_FORMID_alter().
  *
  * Adds node-type specific visibility options to add block form.
  *
@@ -2277,7 +2277,7 @@ function node_form_block_add_block_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORMID_alter().
+ * @implements hook_form_FORMID_alter().
  *
  * Adds node-type specific visibility options to block configuration form.
  *
@@ -2328,7 +2328,7 @@ function node_form_block_admin_configure_submit($form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORMID_alter().
+ * @implements hook_form_FORMID_alter().
  *
  * Adds node specific submit handler to delete custom block form.
  *
@@ -2351,7 +2351,7 @@ function node_form_block_custom_block_delete_submit($form, &$form_state) {
 }
 
 /**
- * Implements hook_modules_uninstalled().
+ * @implements hook_modules_uninstalled().
  *
  * Cleanup {block_node_type} table from modules' blocks.
  */
@@ -2362,7 +2362,7 @@ function node_modules_uninstalled($modules) {
 }
 
 /**
- * Implements hook_block_list_alter().
+ * @implements hook_block_list_alter().
  *
  * Check the content type specific visibilty settings.
  * Remove the block if the visibility conditions are not met.
@@ -2596,7 +2596,7 @@ function node_page_view($node) {
 }
 
 /**
- * Implements hook_update_index().
+ * @implements hook_update_index().
  */
 function node_update_index() {
   $limit = (int)variable_get('search_cron_limit', 100);
@@ -2639,7 +2639,7 @@ function _node_index_node($node) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function node_form_search_form_alter(&$form, $form_state) {
   if (isset($form['module']) && $form['module']['#value'] == 'node' && user_access('use advanced search')) {
@@ -2916,7 +2916,7 @@ function node_access($op, $node, $account = NULL) {
 }
 
 /**
- * Implements hook_node_access().
+ * @implements hook_node_access().
  */
 function node_node_access($node, $op, $account) {
   $type = is_string($node) ? $node : $node->type;
@@ -3104,7 +3104,7 @@ function node_access_view_all_nodes($account = NULL) {
 
 
 /**
- * Implements hook_query_TAG_alter().
+ * @implements hook_query_TAG_alter().
  *
  * This is the hook_query_alter() for queries tagged with 'node_access'.
  * It adds node access checks for the user account given by the 'account'
@@ -3117,7 +3117,7 @@ function node_query_node_access_alter(QueryAlterableInterface $query) {
 }
 
 /**
- * Implements hook_query_TAG_alter().
+ * @implements hook_query_TAG_alter().
  *
  * This function implements the same functionality as
  * node_query_node_access_alter() for the SQL field storage engine. Node access
@@ -3498,7 +3498,7 @@ function _node_access_rebuild_batch_finished($success, $results, $operations) {
  */
 
 /**
- * Implements hook_form().
+ * @implements hook_form().
  */
 function node_content_form($node, $form_state) {
   // It is impossible to define a content type without implementing hook_form()
@@ -3525,7 +3525,7 @@ function node_content_form($node, $form_state) {
  */
 
 /**
- * Implements hook_forms().
+ * @implements hook_forms().
  * All node forms share the same form handler.
  */
 function node_forms() {
@@ -3539,7 +3539,7 @@ function node_forms() {
 }
 
 /**
- * Implements hook_action_info().
+ * @implements hook_action_info().
  */
 function node_action_info() {
   return array(
@@ -3797,7 +3797,7 @@ function node_unpublish_by_keyword_action($node, $context) {
 }
 
 /**
- * Implements hook_requirements().
+ * @implements hook_requirements().
  */
 function node_requirements($phase) {
   $requirements = array();
@@ -3823,7 +3823,7 @@ function node_requirements($phase) {
 }
 
 /**
- * Implements hook_modules_enabled().
+ * @implements hook_modules_enabled().
  */
 function node_modules_enabled($modules) {
   // Check if any of the newly enabled modules require the node_access table to
@@ -3877,7 +3877,7 @@ class NodeController extends DrupalDefaultEntityController {
 }
 
 /**
- * Implements hook_file_download_access().
+ * @implements hook_file_download_access().
  */
 function node_file_download_access($field, $entity_type, $entity) {
   if ($entity_type == 'node') {
diff --git a/modules/node/node.tokens.inc b/modules/node/node.tokens.inc
index 80dbda5..b8f0166 100644
--- a/modules/node/node.tokens.inc
+++ b/modules/node/node.tokens.inc
@@ -8,7 +8,7 @@
 
 
 /**
- * Implements hook_token_info().
+ * @implements hook_token_info().
  */
 function node_token_info() {
   $type = array(
@@ -87,7 +87,7 @@ function node_token_info() {
 }
 
 /**
- * Implements hook_tokens().
+ * @implements hook_tokens().
  */
 function node_tokens($type, $tokens, array $data = array(), array $options = array()) {
   $url_options = array('absolute' => TRUE);
diff --git a/modules/node/tests/node_access_test.module b/modules/node/tests/node_access_test.module
index 3004e0c..088be5d 100644
--- a/modules/node/tests/node_access_test.module
+++ b/modules/node/tests/node_access_test.module
@@ -8,7 +8,7 @@
  */
 
 /**
- * Implements hook_node_grants().
+ * @implements hook_node_grants().
  */
 function node_access_test_node_grants($account, $op) {
   $grants = array();
@@ -22,7 +22,7 @@ function node_access_test_node_grants($account, $op) {
 }
 
 /**
- * Implements hook_node_access_records().
+ * @implements hook_node_access_records().
  */
 function node_access_test_node_access_records($node) {
   $grants = array();
@@ -39,7 +39,7 @@ function node_access_test_node_access_records($node) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  *
  * Sets up permissions for this module.
  */
@@ -48,7 +48,7 @@ function node_access_test_permission() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  *
  * Sets up a page that lists nodes.
  */
diff --git a/modules/node/tests/node_test.module b/modules/node/tests/node_test.module
index b0ebc14..6f6c943 100644
--- a/modules/node/tests/node_test.module
+++ b/modules/node/tests/node_test.module
@@ -7,7 +7,7 @@
  */
 
 /**
- * Implements hook_node_load().
+ * @implements hook_node_load().
  */
 function node_test_node_load($nodes, $types) {
   // Add properties to each loaded node which record the parameters that were
@@ -23,7 +23,7 @@ function node_test_node_load($nodes, $types) {
 }
 
 /**
- * Implements hook_node_view().
+ * @implements hook_node_view().
  */
 function node_test_node_view($node, $view_mode) {
   if ($view_mode == 'rss') {
@@ -50,7 +50,7 @@ function node_test_node_view($node, $view_mode) {
 }
 
 /**
- * Implements hook_node_grants().
+ * @implements hook_node_grants().
  */
 function node_test_node_grants($account, $op) {
   // Give everyone full grants so we don't break other node tests.
@@ -64,7 +64,7 @@ function node_test_node_grants($account, $op) {
 }
 
 /**
- * Implements hook_node_access_records().
+ * @implements hook_node_access_records().
  */
 function node_test_node_access_records($node) {
   // Return nothing when testing for empty responses.
@@ -98,7 +98,7 @@ function node_test_node_access_records($node) {
 }
 
 /**
- * Implements hook_node_access_records_alter().
+ * @implements hook_node_access_records_alter().
  */
 function node_test_node_access_records_alter(&$grants, $node) {
   if (!empty($grants)) {
@@ -113,7 +113,7 @@ function node_test_node_access_records_alter(&$grants, $node) {
 }
 
 /**
- * Implements hook_node_grants_alter().
+ * @implements hook_node_grants_alter().
  */
 function node_test_node_grants_alter(&$grants, $account, $op) {
   // Return an empty array of grants to prove that we can alter by reference.
@@ -121,7 +121,7 @@ function node_test_node_grants_alter(&$grants, $account, $op) {
 }
 
 /**
- * Implements hook_node_presave().
+ * @implements hook_node_presave().
  */
 function node_test_node_presave($node) {
   if ($node->title == 'testing_node_presave') {
@@ -139,7 +139,7 @@ function node_test_node_presave($node) {
 }
 
 /**
- * Implements hook_node_update().
+ * @implements hook_node_update().
  */
 function node_test_node_update($node) {
   // Determine changes on update.
diff --git a/modules/node/tests/node_test_exception.module b/modules/node/tests/node_test_exception.module
index 0fe9f35..5061f64 100644
--- a/modules/node/tests/node_test_exception.module
+++ b/modules/node/tests/node_test_exception.module
@@ -7,7 +7,7 @@
  */
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function node_test_exception_node_insert($node) {
   if ($node->title == 'testing_transaction_exception') {
diff --git a/modules/openid/openid.install b/modules/openid/openid.install
index 2df39aa..b9dcc8a 100644
--- a/modules/openid/openid.install
+++ b/modules/openid/openid.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function openid_schema() {
   $schema['openid_association'] = array(
@@ -84,7 +84,7 @@ function openid_schema() {
 }
 
 /**
- * Implements hook_requirements().
+ * @implements hook_requirements().
  */
 function openid_requirements($phase) {
   $requirements = array();
diff --git a/modules/openid/openid.module b/modules/openid/openid.module
index 7673de8..dabbd37 100644
--- a/modules/openid/openid.module
+++ b/modules/openid/openid.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function openid_menu() {
   $items['openid/authenticate'] = array(
@@ -37,7 +37,7 @@ function openid_menu() {
 }
 
 /**
- * Implements hook_menu_site_status_alter().
+ * @implements hook_menu_site_status_alter().
  */
 function openid_menu_site_status_alter(&$menu_site_status, $path) {
   // Allow access to openid/authenticate even if site is in offline mode.
@@ -47,7 +47,7 @@ function openid_menu_site_status_alter(&$menu_site_status, $path) {
 }
 
 /**
- * Implements hook_admin_paths().
+ * @implements hook_admin_paths().
  */
 function openid_admin_paths() {
   $paths = array(
@@ -58,7 +58,7 @@ function openid_admin_paths() {
 }
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function openid_help($path, $arg) {
   switch ($path) {
@@ -81,7 +81,7 @@ function openid_help($path, $arg) {
 }
 
 /**
- * Implements hook_user_insert().
+ * @implements hook_user_insert().
  */
 function openid_user_insert(&$edit, $account, $category) {
   if (!empty($edit['openid_claimed_id'])) {
@@ -96,7 +96,7 @@ function openid_user_insert(&$edit, $account, $category) {
 }
 
 /**
- * Implements hook_user_login().
+ * @implements hook_user_login().
  *
  * Save openid_identifier to visitor cookie.
  */
@@ -109,7 +109,7 @@ function openid_user_login(&$edit, $account) {
 }
 
 /**
- * Implements hook_user_logout().
+ * @implements hook_user_logout().
  *
  * Delete any openid_identifier in visitor cookie.
  */
@@ -120,14 +120,14 @@ function openid_user_logout($account) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function openid_form_user_login_block_alter(&$form, &$form_state) {
   _openid_user_login_form_alter($form, $form_state);
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function openid_form_user_login_alter(&$form, &$form_state) {
   _openid_user_login_form_alter($form, $form_state);
@@ -175,7 +175,7 @@ function _openid_user_login_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  *
  * Prefills the login form with values acquired via OpenID.
  */
diff --git a/modules/openid/tests/openid_test.install b/modules/openid/tests/openid_test.install
index 3bd4978..42dea78 100644
--- a/modules/openid/tests/openid_test.install
+++ b/modules/openid/tests/openid_test.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function openid_test_install() {
   module_load_include('inc', 'openid');
diff --git a/modules/openid/tests/openid_test.module b/modules/openid/tests/openid_test.module
index d2afa9f..01fae5f 100644
--- a/modules/openid/tests/openid_test.module
+++ b/modules/openid/tests/openid_test.module
@@ -21,7 +21,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function openid_test_menu() {
   $items['openid-test/yadis/xrds'] = array(
@@ -64,7 +64,7 @@ function openid_test_menu() {
 }
 
 /**
- * Implements hook_menu_site_status_alter().
+ * @implements hook_menu_site_status_alter().
  */
 function openid_test_menu_site_status_alter(&$menu_site_status, $path) {
   // Allow access to openid endpoint and identity even in offline mode.
diff --git a/modules/overlay/overlay.install b/modules/overlay/overlay.install
index 2fa7c84..a2ec76c 100644
--- a/modules/overlay/overlay.install
+++ b/modules/overlay/overlay.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_enable().
+ * @implements hook_enable().
  *
  * If the module is being enabled through the admin UI, and not from an
  * install profile, reopen the modules page in an overlay.
diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module
index 84b7554..1f10dc6 100644
--- a/modules/overlay/overlay.module
+++ b/modules/overlay/overlay.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function overlay_help($path, $arg) {
   switch ($path) {
@@ -19,7 +19,7 @@ function overlay_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function overlay_menu() {
   $items['overlay-ajax/%'] = array(
@@ -39,7 +39,7 @@ function overlay_menu() {
 }
 
 /**
- * Implements hook_admin_paths().
+ * @implements hook_admin_paths().
  */
 function overlay_admin_paths() {
   $paths = array(
@@ -52,7 +52,7 @@ function overlay_admin_paths() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function overlay_permission() {
   return array(
@@ -64,7 +64,7 @@ function overlay_permission() {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function overlay_theme() {
   return array(
@@ -79,7 +79,7 @@ function overlay_theme() {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function overlay_form_user_profile_form_alter(&$form, &$form_state) {
   if ($form['#user_category'] == 'account') {
@@ -103,7 +103,7 @@ function overlay_form_user_profile_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_user_presave().
+ * @implements hook_user_presave().
  */
 function overlay_user_presave(&$edit, $account, $category) {
   if (isset($edit['overlay'])) {
@@ -112,7 +112,7 @@ function overlay_user_presave(&$edit, $account, $category) {
 }
 
 /**
- * Implements hook_init().
+ * @implements hook_init().
  *
  * Determine whether the current page request is destined to appear in the
  * parent window or in the overlay window, and format the page accordingly.
@@ -157,7 +157,7 @@ function overlay_init() {
 }
 
 /**
- * Implements hook_exit().
+ * @implements hook_exit().
  *
  * When viewing an overlay child page, check if we need to trigger a refresh of
  * the supplemental regions of the overlay on the next page request.
@@ -187,7 +187,7 @@ function overlay_exit() {
 }
 
 /**
- * Implements hook_library().
+ * @implements hook_library().
  */
 function overlay_library() {
   $module_path = drupal_get_path('module', 'overlay');
@@ -225,7 +225,7 @@ function overlay_library() {
 }
 
 /**
- * Implements hook_drupal_goto_alter().
+ * @implements hook_drupal_goto_alter().
  *
  * If the current page request is inside the overlay, add ?render=overlay to
  * the new path, so that it appears correctly inside the overlay.
@@ -244,7 +244,7 @@ function overlay_drupal_goto_alter(&$path, &$options, &$http_response_code) {
 }
 
 /**
- * Implements hook_batch_alter().
+ * @implements hook_batch_alter().
  *
  * If the current page request is inside the overlay, add ?render=overlay to
  * the success callback URL, so that it appears correctly within the overlay.
@@ -263,7 +263,7 @@ function overlay_batch_alter(&$batch) {
 }
 
 /**
- * Implements hook_page_alter().
+ * @implements hook_page_alter().
  */
 function overlay_page_alter(&$page) {
   // If we are limiting rendering to a subset of page regions, deny access to
@@ -399,7 +399,7 @@ function theme_overlay_disable_message($variables) {
 }
 
 /**
- * Implements hook_block_list_alter().
+ * @implements hook_block_list_alter().
  */
 function overlay_block_list_alter(&$blocks) {
   // If we are limiting rendering to a subset of page regions, hide all blocks
@@ -418,7 +418,7 @@ function overlay_block_list_alter(&$blocks) {
 }
 
 /**
- * Implements hook_system_info_alter().
+ * @implements hook_system_info_alter().
  *
  * Add default regions for the overlay.
  */
@@ -430,7 +430,7 @@ function overlay_system_info_alter(&$info, $file, $type) {
 }
 
 /**
- * Implements hook_preprocess_html().
+ * @implements hook_preprocess_html().
  *
  * If the current page request is inside the overlay, add appropriate classes
  * to the <body> element, and simplify the page title.
@@ -445,7 +445,7 @@ function overlay_preprocess_html(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_maintenance_page().
+ * @implements hook_preprocess_maintenance_page().
  *
  * If the current page request is inside the overlay, add appropriate classes
  * to the <body> element, and simplify the page title.
@@ -480,7 +480,7 @@ function template_process_overlay(&$variables) {
 }
 
 /**
- * Implements hook_preprocess_page().
+ * @implements hook_preprocess_page().
  *
  * Hide tabs inside the overlay.
  *
@@ -525,7 +525,7 @@ function overlay_display_empty_page($value = NULL) {
 }
 
 /**
- * Implements hook_page_delivery_callback_alter().
+ * @implements hook_page_delivery_callback_alter().
  */
 function overlay_page_delivery_callback_alter(&$callback) {
   if (overlay_display_empty_page()) {
@@ -616,7 +616,7 @@ function overlay_set_mode($mode = NULL) {
 }
 
 /**
- * Implements hook_overlay_parent_initialize().
+ * @implements hook_overlay_parent_initialize().
  */
 function overlay_overlay_parent_initialize() {
   // Let the client side know which paths are administrative.
@@ -630,7 +630,7 @@ function overlay_overlay_parent_initialize() {
 }
 
 /**
- * Implements hook_overlay_child_initialize().
+ * @implements hook_overlay_child_initialize().
  */
 function overlay_overlay_child_initialize() {
   // Check if the parent window needs to refresh any page regions on this page
diff --git a/modules/path/path.module b/modules/path/path.module
index 332287d..e5bf3a8 100644
--- a/modules/path/path.module
+++ b/modules/path/path.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function path_help($path, $arg) {
   switch ($path) {
@@ -35,7 +35,7 @@ function path_help($path, $arg) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function path_permission() {
   return array(
@@ -49,7 +49,7 @@ function path_permission() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function path_menu() {
   $items['admin/config/search/path'] = array(
@@ -91,7 +91,7 @@ function path_menu() {
 }
 
 /**
- * Implements hook_form_BASE_FORM_ID_alter().
+ * @implements hook_form_BASE_FORM_ID_alter().
  */
 function path_form_node_form_alter(&$form, $form_state) {
   $path = array();
@@ -179,7 +179,7 @@ function path_form_element_validate($element, &$form_state, $complete_form) {
 }
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function path_node_insert($node) {
   if (isset($node->path)) {
@@ -196,7 +196,7 @@ function path_node_insert($node) {
 }
 
 /**
- * Implements hook_node_update().
+ * @implements hook_node_update().
  */
 function path_node_update($node) {
   if (isset($node->path)) {
@@ -217,7 +217,7 @@ function path_node_update($node) {
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function path_node_delete($node) {
   // Delete all aliases associated with this node.
@@ -225,7 +225,7 @@ function path_node_delete($node) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function path_form_taxonomy_form_term_alter(&$form, $form_state) {
   // Make sure this does not show up on the delete confirmation form.
@@ -260,7 +260,7 @@ function path_form_taxonomy_form_term_alter(&$form, $form_state) {
 }
 
 /**
- * Implements hook_taxonomy_term_insert().
+ * @implements hook_taxonomy_term_insert().
  */
 function path_taxonomy_term_insert($term) {
   if (isset($term->path)) {
@@ -277,7 +277,7 @@ function path_taxonomy_term_insert($term) {
 }
 
 /**
- * Implements hook_taxonomy_term_update().
+ * @implements hook_taxonomy_term_update().
  */
 function path_taxonomy_term_update($term) {
   if (isset($term->path)) {
@@ -298,7 +298,7 @@ function path_taxonomy_term_update($term) {
 }
 
 /**
- * Implements hook_taxonomy_term_delete().
+ * @implements hook_taxonomy_term_delete().
  */
 function path_taxonomy_term_delete($term) {
   // Delete all aliases associated with this term.
diff --git a/modules/php/php.install b/modules/php/php.install
index 12944dd..ed5706b 100644
--- a/modules/php/php.install
+++ b/modules/php/php.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_enable().
+ * @implements hook_enable().
  */
 function php_enable() {
   $format_exists = (bool) db_query_range('SELECT 1 FROM {filter_format} WHERE name = :name', 0, 1, array(':name' => 'PHP code'))->fetchField();
@@ -38,7 +38,7 @@ function php_enable() {
 }
 
 /**
- * Implements hook_disable().
+ * @implements hook_disable().
  */
 function php_disable() {
   drupal_set_message(t('The PHP module has been disabled. Any existing content that was using the PHP filter will now be visible in plain text. This might pose a security risk by exposing sensitive information, if any, used in the PHP code.'));
diff --git a/modules/php/php.module b/modules/php/php.module
index 37bf9a1..23b94ed 100644
--- a/modules/php/php.module
+++ b/modules/php/php.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function php_help($path, $arg) {
   switch ($path) {
@@ -24,7 +24,7 @@ function php_help($path, $arg) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function php_permission() {
   return array(
@@ -123,7 +123,7 @@ else {
 }
 
 /**
- * Implements hook_filter_info().
+ * @implements hook_filter_info().
  *
  * Provide PHP code filter. Use with care.
  */
diff --git a/modules/poll/poll.install b/modules/poll/poll.install
index c848445..d00d457 100644
--- a/modules/poll/poll.install
+++ b/modules/poll/poll.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function poll_schema() {
   $schema['poll'] = array(
diff --git a/modules/poll/poll.module b/modules/poll/poll.module
index f45b8bd..faa06bc 100644
--- a/modules/poll/poll.module
+++ b/modules/poll/poll.module
@@ -7,7 +7,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function poll_help($path, $arg) {
   switch ($path) {
@@ -27,7 +27,7 @@ function poll_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function poll_theme() {
   $theme_hooks = array(
@@ -65,7 +65,7 @@ function poll_theme() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function poll_permission() {
   $perms = array(
@@ -84,7 +84,7 @@ function poll_permission() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function poll_menu() {
   $items['poll'] = array(
@@ -128,7 +128,7 @@ function _poll_menu_access($node, $perm, $inspect_allowvotes) {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function poll_block_info() {
   $blocks['recent']['info'] = t('Most recent poll');
@@ -137,7 +137,7 @@ function poll_block_info() {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  *
  * Generates a block containing the latest poll.
  */
@@ -167,7 +167,7 @@ function poll_block_view($delta = '') {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  *
  * Closes polls that have exceeded their allowed runtime.
  */
@@ -182,7 +182,7 @@ function poll_cron() {
 }
 
 /**
- * Implements hook_node_info().
+ * @implements hook_node_info().
  */
 function poll_node_info() {
   return array(
@@ -197,7 +197,7 @@ function poll_node_info() {
 }
 
 /**
- * Implements hook_field_extra_fields().
+ * @implements hook_field_extra_fields().
  */
 function poll_field_extra_fields() {
   $extra['node']['poll'] = array(
@@ -231,7 +231,7 @@ function poll_field_extra_fields() {
 }
 
 /**
- * Implements hook_form().
+ * @implements hook_form().
  */
 function poll_form($node, &$form_state) {
   global $user;
@@ -445,7 +445,7 @@ function poll_node_form_submit(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_validate().
+ * @implements hook_validate().
  */
 function poll_validate($node, $form) {
   if (isset($node->title)) {
@@ -469,7 +469,7 @@ function poll_validate($node, $form) {
 }
 
 /**
- * Implements hook_field_attach_prepare_translation_alter().
+ * @implements hook_field_attach_prepare_translation_alter().
  */
 function poll_field_attach_prepare_translation_alter(&$entity, $context) {
   if ($context['entity_type'] == 'node' && $entity->type == 'poll') {
@@ -478,7 +478,7 @@ function poll_field_attach_prepare_translation_alter(&$entity, $context) {
 }
 
 /**
- * Implements hook_load().
+ * @implements hook_load().
  */
 function poll_load($nodes) {
   global $user;
@@ -522,7 +522,7 @@ function poll_load($nodes) {
 }
 
 /**
- * Implements hook_insert().
+ * @implements hook_insert().
  */
 function poll_insert($node) {
   if (!user_access('administer nodes')) {
@@ -556,7 +556,7 @@ function poll_insert($node) {
 }
 
 /**
- * Implements hook_update().
+ * @implements hook_update().
  */
 function poll_update($node) {
   // Update poll settings.
@@ -592,7 +592,7 @@ function poll_update($node) {
 }
 
 /**
- * Implements hook_delete().
+ * @implements hook_delete().
  */
 function poll_delete($node) {
   db_delete('poll')
@@ -653,7 +653,7 @@ function poll_block_latest_poll_view($node) {
 
 
 /**
- * Implements hook_view().
+ * @implements hook_view().
  */
 function poll_view($node, $view_mode) {
   global $user;
@@ -963,7 +963,7 @@ function poll_cancel($form, &$form_state) {
 }
 
 /**
- * Implements hook_user_cancel().
+ * @implements hook_user_cancel().
  */
 function poll_user_cancel($edit, $account, $method) {
   switch ($method) {
@@ -977,7 +977,7 @@ function poll_user_cancel($edit, $account, $method) {
 }
 
 /**
- * Implements hook_user_delete().
+ * @implements hook_user_delete().
  */
 function poll_user_delete($account) {
   db_delete('poll_vote')
@@ -986,7 +986,7 @@ function poll_user_delete($account) {
 }
 
 /**
- * Implements hook_rdf_mapping().
+ * @implements hook_rdf_mapping().
  */
 function poll_rdf_mapping() {
   return array(
diff --git a/modules/poll/poll.tokens.inc b/modules/poll/poll.tokens.inc
index eda628b..f2aaaf4 100644
--- a/modules/poll/poll.tokens.inc
+++ b/modules/poll/poll.tokens.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_token_info().
+ * @implements hook_token_info().
  */
 function poll_token_info() {
   $node['poll-votes'] = array(
@@ -36,7 +36,7 @@ function poll_token_info() {
 }
 
 /**
- * Implements hook_tokens().
+ * @implements hook_tokens().
  */
 function poll_tokens($type, $tokens, array $data = array(), array $options = array()) {
   $sanitize = !empty($options['sanitize']);
diff --git a/modules/profile/profile.install b/modules/profile/profile.install
index c5747cf..1e9268a 100644
--- a/modules/profile/profile.install
+++ b/modules/profile/profile.install
@@ -6,14 +6,14 @@
  */
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function profile_uninstall() {
   variable_del('profile_block_author_fields');
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function profile_schema() {
   $schema['profile_field'] = array(
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 2374fe8..a691a90 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -26,7 +26,7 @@ define('PROFILE_PUBLIC_LISTINGS', 3);
 define('PROFILE_HIDDEN', 4);
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function profile_help($path, $arg) {
   switch ($path) {
@@ -50,7 +50,7 @@ function profile_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function profile_theme() {
   return array(
@@ -74,7 +74,7 @@ function profile_theme() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function profile_menu() {
   $items['profile'] = array(
@@ -134,7 +134,7 @@ function profile_menu() {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
  function profile_block_info() {
   $blocks['author-information']['info'] = t('Author information');
@@ -143,7 +143,7 @@ function profile_menu() {
 }
 
 /**
- * Implements hook_block_configure().
+ * @implements hook_block_configure().
  */
 function profile_block_configure($delta = '') {
   // Compile a list of fields to show
@@ -164,14 +164,14 @@ function profile_block_configure($delta = '') {
 }
 
 /**
- * Implements hook_block_save().
+ * @implements hook_block_save().
  */
 function profile_block_save($delta = '', $edit = array()) {
   variable_set('profile_block_author_fields', $edit['profile_block_author_fields']);
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  */
 function profile_block_view($delta = '') {
   if (user_access('access user profiles')) {
@@ -211,7 +211,7 @@ function profile_block_view($delta = '') {
 }
 
 /**
- * Implements hook_user_presave().
+ * @implements hook_user_presave().
  */
 function profile_user_presave(&$edit, $account, $category) {
   if ($account->uid) {
@@ -220,14 +220,14 @@ function profile_user_presave(&$edit, $account, $category) {
 }
 
 /**
- * Implements hook_user_insert().
+ * @implements hook_user_insert().
  */
 function profile_user_insert(&$edit, $account, $category) {
   profile_save_profile($edit, $account, $category, TRUE);
 }
 
 /**
- * Implements hook_user_cancel().
+ * @implements hook_user_cancel().
  */
 function profile_user_cancel(&$edit, $account, $method) {
   switch ($method) {
@@ -239,7 +239,7 @@ function profile_user_cancel(&$edit, $account, $method) {
 }
 
 /**
- * Implements hook_user_delete().
+ * @implements hook_user_delete().
  */
 function profile_user_delete($account) {
   db_delete('profile_value')
@@ -248,7 +248,7 @@ function profile_user_delete($account) {
 }
 
 /**
- * Implements hook_user_load().
+ * @implements hook_user_load().
  */
 function profile_user_load($users) {
   $result = db_query('SELECT f.name, f.type, v.uid, v.value FROM {profile_field} f INNER JOIN {profile_value} v ON f.fid = v.fid WHERE uid IN (:uids)', array(':uids' => array_keys($users)));
@@ -323,7 +323,7 @@ function profile_view_field($account, $field) {
 }
 
 /**
- * Implements hook_user_view().
+ * @implements hook_user_view().
  */
 function profile_user_view($account) {
   // Show private fields to administrators and people viewing their own account.
@@ -373,7 +373,7 @@ function _profile_form_explanation($field) {
 }
 
 /**
- * Implements hook_form_alter().
+ * @implements hook_form_alter().
  */
 function profile_form_alter(&$form, &$form_state, $form_id) {
   if (!($form_id == 'user_register_form' || $form_id == 'user_profile_form')) {
@@ -495,7 +495,7 @@ function profile_user_form_validate($form, &$form_state) {
 }
 
 /**
- * Implements hook_user_categories().
+ * @implements hook_user_categories().
  */
 function profile_user_categories() {
   $result = db_query("SELECT DISTINCT(category) FROM {profile_field}");
diff --git a/modules/rdf/rdf.install b/modules/rdf/rdf.install
index 10d3f8d..99d0806 100644
--- a/modules/rdf/rdf.install
+++ b/modules/rdf/rdf.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function rdf_schema() {
   $schema['rdf_mapping'] = array(
@@ -39,7 +39,7 @@ function rdf_schema() {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function rdf_install() {
   // Collect any RDF mappings that were declared by modules installed before
diff --git a/modules/rdf/rdf.module b/modules/rdf/rdf.module
index ebecd42..5c40ff6 100644
--- a/modules/rdf/rdf.module
+++ b/modules/rdf/rdf.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function rdf_help($path, $arg) {
   switch ($path) {
@@ -74,7 +74,7 @@ function rdf_help($path, $arg) {
 define('RDF_DEFAULT_BUNDLE', '');
 
 /**
- * Implements hook_rdf_namespaces().
+ * @implements hook_rdf_namespaces().
  */
 function rdf_rdf_namespaces() {
   return array(
@@ -322,7 +322,7 @@ function rdf_rdfa_attributes($mapping, $data = NULL) {
  */
 
 /**
- * Implements hook_modules_installed().
+ * @implements hook_modules_installed().
  *
  * Checks if the installed modules have any RDF mapping definitions to declare
  * and stores them in the rdf_mapping table.
@@ -348,14 +348,14 @@ function rdf_modules_installed($modules) {
 }
 
 /**
- * Implements hook_modules_uninstalled().
+ * @implements hook_modules_uninstalled().
  */
 function rdf_modules_uninstalled($modules) {
   // @todo Remove RDF mappings of uninstalled modules.
 }
 
 /**
- * Implements hook_entity_info_alter().
+ * @implements hook_entity_info_alter().
  *
  * Adds the proper RDF mapping to each entity type/bundle pair.
  *
@@ -384,7 +384,7 @@ function rdf_entity_info_alter(&$entity_info) {
 }
 
 /**
- * Implements hook_entity_load().
+ * @implements hook_entity_load().
  */
 function rdf_entity_load($entities, $type) {
   foreach ($entities as $entity) {
@@ -395,7 +395,7 @@ function rdf_entity_load($entities, $type) {
 }
 
 /**
- * Implements hook_comment_load().
+ * @implements hook_comment_load().
  */
 function rdf_comment_load($comments) {
   foreach ($comments as $comment) {
@@ -411,7 +411,7 @@ function rdf_comment_load($comments) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function rdf_theme() {
   return array(
@@ -740,7 +740,7 @@ function rdf_preprocess_taxonomy_term(&$variables) {
 }
 
 /**
- * Implements hook_field_attach_view_alter().
+ * @implements hook_field_attach_view_alter().
  */
 function rdf_field_attach_view_alter(&$output, $context) {
   // Append term mappings on displayed taxonomy links.
diff --git a/modules/rdf/tests/rdf_test.install b/modules/rdf/tests/rdf_test.install
index 91a3392..55e083c 100644
--- a/modules/rdf/tests/rdf_test.install
+++ b/modules/rdf/tests/rdf_test.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function rdf_test_install() {
   $rdf_mappings = array(
diff --git a/modules/rdf/tests/rdf_test.module b/modules/rdf/tests/rdf_test.module
index c133a33..eacab45 100644
--- a/modules/rdf/tests/rdf_test.module
+++ b/modules/rdf/tests/rdf_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_rdf_mapping().
+ * @implements hook_rdf_mapping().
  */
 function rdf_test_rdf_mapping() {
   return array(
@@ -55,7 +55,7 @@ function rdf_test_rdf_mapping() {
 }
 
 /**
- * Implements hook_rdf_namespaces().
+ * @implements hook_rdf_namespaces().
  */
 function rdf_test_rdf_namespaces() {
   return array(
diff --git a/modules/search/search.install b/modules/search/search.install
index c450f05..4a05207 100644
--- a/modules/search/search.install
+++ b/modules/search/search.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function search_uninstall() {
   variable_del('minimum_word_size');
@@ -15,7 +15,7 @@ function search_uninstall() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function search_schema() {
   $schema['search_dataset'] = array(
diff --git a/modules/search/search.module b/modules/search/search.module
index 518272a..bb9650d 100644
--- a/modules/search/search.module
+++ b/modules/search/search.module
@@ -61,7 +61,7 @@ define('PREG_CLASS_CJK', '\x{1100}-\x{11FF}\x{3040}-\x{309F}\x{30A1}-\x{318E}' .
   '\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}');
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function search_help($path, $arg) {
   switch ($path) {
@@ -97,7 +97,7 @@ function search_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function search_theme() {
   return array(
@@ -119,7 +119,7 @@ function search_theme() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function search_permission() {
   return array(
@@ -136,7 +136,7 @@ function search_permission() {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function search_block_info() {
   $blocks['form']['info'] = t('Search form');
@@ -147,7 +147,7 @@ function search_block_info() {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  */
 function search_block_view($delta = '') {
   if (user_access('search content')) {
@@ -157,7 +157,7 @@ function search_block_view($delta = '') {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function search_menu() {
   $items['search'] = array(
@@ -347,7 +347,7 @@ function search_dirty($word = NULL) {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  *
  * Fires hook_update_index() in all modules and cleans up dirty words.
  *
@@ -789,7 +789,7 @@ function search_touch_node($nid) {
 }
 
 /**
- * Implements hook_node_update_index().
+ * @implements hook_node_update_index().
  */
 function search_node_update_index($node) {
   // Transplant links to a node into the target node.
@@ -804,7 +804,7 @@ function search_node_update_index($node) {
 }
 
 /**
- * Implements hook_node_update().
+ * @implements hook_node_update().
  */
 function search_node_update($node) {
   // Reindex the node when it is updated. The node is automatically indexed
@@ -813,7 +813,7 @@ function search_node_update($node) {
 }
 
 /**
- * Implements hook_comment_insert().
+ * @implements hook_comment_insert().
  */
 function search_comment_insert($comment) {
   // Reindex the node when comments are added.
@@ -821,7 +821,7 @@ function search_comment_insert($comment) {
 }
 
 /**
- * Implements hook_comment_update().
+ * @implements hook_comment_update().
  */
 function search_comment_update($comment) {
   // Reindex the node when comments are changed.
@@ -829,7 +829,7 @@ function search_comment_update($comment) {
 }
 
 /**
- * Implements hook_comment_delete().
+ * @implements hook_comment_delete().
  */
 function search_comment_delete($comment) {
   // Reindex the node when comments are deleted.
@@ -837,7 +837,7 @@ function search_comment_delete($comment) {
 }
 
 /**
- * Implements hook_comment_publish().
+ * @implements hook_comment_publish().
  */
 function search_comment_publish($comment) {
   // Reindex the node when comments are published.
@@ -845,7 +845,7 @@ function search_comment_publish($comment) {
 }
 
 /**
- * Implements hook_comment_unpublish().
+ * @implements hook_comment_unpublish().
  */
 function search_comment_unpublish($comment) {
   // Reindex the node when comments are unpublished.
@@ -1339,7 +1339,7 @@ function _search_excerpt_match_filter($var) {
 }
 
 /**
- * Implements hook_forms().
+ * @implements hook_forms().
  */
 function search_forms() {
   $forms['search_block_form']= array(
diff --git a/modules/search/tests/search_embedded_form.module b/modules/search/tests/search_embedded_form.module
index c0058f7..eb97039 100644
--- a/modules/search/tests/search_embedded_form.module
+++ b/modules/search/tests/search_embedded_form.module
@@ -10,7 +10,7 @@
  */
 
 /**
-  * Implements hook_menu().
+ * @implements hook_menu().
   */
 function search_embedded_form_menu() {
   $items['search_embedded_form'] = array(
diff --git a/modules/search/tests/search_extra_type.module b/modules/search/tests/search_extra_type.module
index 80c050c..c8bc40e 100644
--- a/modules/search/tests/search_extra_type.module
+++ b/modules/search/tests/search_extra_type.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_search_info().
+ * @implements hook_search_info().
  */
 function search_extra_type_search_info() {
   return array(
@@ -29,7 +29,7 @@ function search_extra_type_conditions() {
 }
 
 /**
- * Implements hook_search_execute().
+ * @implements hook_search_execute().
  *
  * This is a dummy search, so when search "executes", we just return a dummy
  * result containing the keywords and a list of conditions.
@@ -49,7 +49,7 @@ function search_extra_type_search_execute($keys = NULL, $conditions = NULL) {
 }
 
 /**
- * Implements hook_search_page().
+ * @implements hook_search_page().
  *
  * Adds some text to the search page so we can verify that it runs.
  */
diff --git a/modules/shortcut/shortcut.install b/modules/shortcut/shortcut.install
index 209a907..122098b 100644
--- a/modules/shortcut/shortcut.install
+++ b/modules/shortcut/shortcut.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function shortcut_install() {
   $t = get_t();
@@ -29,7 +29,7 @@ function shortcut_install() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function shortcut_uninstall() {
   // Delete the menu links associated with each shortcut set.
@@ -39,7 +39,7 @@ function shortcut_uninstall() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function shortcut_schema() {
   $schema['shortcut_set'] = array(
diff --git a/modules/shortcut/shortcut.module b/modules/shortcut/shortcut.module
index d2ac72b..d49926a 100644
--- a/modules/shortcut/shortcut.module
+++ b/modules/shortcut/shortcut.module
@@ -14,7 +14,7 @@
 define('SHORTCUT_DEFAULT_SET_NAME', 'shortcut-set-1');
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function shortcut_help($path, $arg) {
   global $user;
@@ -45,7 +45,7 @@ function shortcut_help($path, $arg) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function shortcut_permission() {
   return array(
@@ -64,7 +64,7 @@ function shortcut_permission() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function shortcut_menu() {
   $items['admin/config/user-interface/shortcut'] = array(
@@ -162,7 +162,7 @@ function shortcut_menu() {
 }
 
 /**
- * Implements hook_admin_paths().
+ * @implements hook_admin_paths().
  */
 function shortcut_admin_paths() {
   $paths = array(
@@ -172,7 +172,7 @@ function shortcut_admin_paths() {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function shortcut_theme() {
   return array(
@@ -184,7 +184,7 @@ function shortcut_theme() {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function shortcut_block_info() {
   $blocks['shortcuts']['info'] = t('Shortcuts');
@@ -195,7 +195,7 @@ function shortcut_block_info() {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  */
 function shortcut_block_view($delta = '') {
   if ($delta == 'shortcuts') {
@@ -640,7 +640,7 @@ function shortcut_renderable_links($shortcut_set = NULL) {
 }
 
 /**
- * Implements hook_preprocess_page().
+ * @implements hook_preprocess_page().
  */
 function shortcut_preprocess_page(&$variables) {
   if (shortcut_set_edit_access()) {
@@ -692,7 +692,7 @@ function shortcut_preprocess_page(&$variables) {
 }
 
 /**
- * Implements hook_page_alter().
+ * @implements hook_page_alter().
  */
 function shortcut_page_alter(&$page) {
   if (isset($page['page_top']['toolbar'])) {
diff --git a/modules/simpletest/simpletest.install b/modules/simpletest/simpletest.install
index 0f017e7..73f7e0a 100644
--- a/modules/simpletest/simpletest.install
+++ b/modules/simpletest/simpletest.install
@@ -11,7 +11,7 @@
 define('SIMPLETEST_MINIMUM_PHP_MEMORY_LIMIT', '64M');
 
 /**
- * Implements hook_requirements().
+ * @implements hook_requirements().
  */
 function simpletest_requirements($phase) {
   $requirements = array();
@@ -72,7 +72,7 @@ function simpletest_requirements($phase) {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function simpletest_schema() {
   $schema['simpletest'] = array(
@@ -164,7 +164,7 @@ function simpletest_schema() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function simpletest_uninstall() {
   simpletest_clean_environment();
diff --git a/modules/simpletest/simpletest.module b/modules/simpletest/simpletest.module
index b992fd2..df1d5af 100644
--- a/modules/simpletest/simpletest.module
+++ b/modules/simpletest/simpletest.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function simpletest_help($path, $arg) {
   switch ($path) {
@@ -25,7 +25,7 @@ function simpletest_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function simpletest_menu() {
   $items['admin/config/development/testing'] = array(
@@ -61,7 +61,7 @@ function simpletest_menu() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function simpletest_permission() {
   return array(
@@ -73,7 +73,7 @@ function simpletest_permission() {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function simpletest_theme() {
   return array(
@@ -89,7 +89,7 @@ function simpletest_theme() {
 }
 
 /**
- * Implements hook_js_alter().
+ * @implements hook_js_alter().
  */
 function simpletest_js_alter(&$javascript) {
   // Since SimpleTest is a special use case for the table select, stick the
@@ -354,7 +354,7 @@ function simpletest_test_get_all() {
 }
 
 /**
- * Implements hook_registry_files_alter().
+ * @implements hook_registry_files_alter().
  *
  * Add the test files for disabled modules so that we get a list containing
  * all the avialable tests.
diff --git a/modules/simpletest/tests/actions_loop_test.install b/modules/simpletest/tests/actions_loop_test.install
index b22fd85..6247e04 100644
--- a/modules/simpletest/tests/actions_loop_test.install
+++ b/modules/simpletest/tests/actions_loop_test.install
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function actions_loop_test_install() {
    db_update('system')
diff --git a/modules/simpletest/tests/actions_loop_test.module b/modules/simpletest/tests/actions_loop_test.module
index 7776490..59764be 100644
--- a/modules/simpletest/tests/actions_loop_test.module
+++ b/modules/simpletest/tests/actions_loop_test.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_trigger_info().
+ * @implements hook_trigger_info().
  */
 function actions_loop_test_trigger_info() {
   return array(
@@ -14,7 +14,7 @@ function actions_loop_test_trigger_info() {
 }
 
 /**
- * Implements hook_watchdog().
+ * @implements hook_watchdog().
  */
 function actions_loop_test_watchdog(array $log_entry) {
   // If the triggering actions are not explicitly enabled, abort.
@@ -35,7 +35,7 @@ function actions_loop_test_watchdog(array $log_entry) {
 }
 
 /**
- * Implements hook_init().
+ * @implements hook_init().
  */
 function actions_loop_test_init() {
   if (!empty($_GET['trigger_actions_on_watchdog'])) {
@@ -44,7 +44,7 @@ function actions_loop_test_init() {
 }
 
 /**
- * Implements hook_action_info().
+ * @implements hook_action_info().
  */
 function actions_loop_test_action_info() {
   return array(
diff --git a/modules/simpletest/tests/ajax_forms_test.module b/modules/simpletest/tests/ajax_forms_test.module
index d38cbbb..c3602d1 100644
--- a/modules/simpletest/tests/ajax_forms_test.module
+++ b/modules/simpletest/tests/ajax_forms_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  * @return unknown_type
  */
 function ajax_forms_test_menu() {
diff --git a/modules/simpletest/tests/ajax_test.module b/modules/simpletest/tests/ajax_test.module
index 4148a08..48b7767 100644
--- a/modules/simpletest/tests/ajax_test.module
+++ b/modules/simpletest/tests/ajax_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function ajax_test_menu() {
   $items['ajax-test/render'] = array(
diff --git a/modules/simpletest/tests/common_test.module b/modules/simpletest/tests/common_test.module
index 9b61788..47edc09 100644
--- a/modules/simpletest/tests/common_test.module
+++ b/modules/simpletest/tests/common_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function common_test_menu() {
   $items['common-test/drupal_goto'] = array(
@@ -84,7 +84,7 @@ function common_test_drupal_goto_land_fail() {
 }
 
 /**
- * Implements hook_drupal_goto_alter().
+ * @implements hook_drupal_goto_alter().
  */
 function common_test_drupal_goto_alter(&$path, &$options, &$http_response_code) {
   if ($path == 'common-test/drupal_goto/fail') {
@@ -101,7 +101,7 @@ function common_test_destination() {
 }
 
 /**
- * Implements hook_TYPE_alter().
+ * @implements hook_TYPE_alter().
  */
 function common_test_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
   // Alter first argument.
@@ -132,7 +132,7 @@ function common_test_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
 }
 
 /**
- * Implements hook_TYPE_alter() on behalf of Bartik theme.
+ * @implements hook_TYPE_alter() on behalf of Bartik theme.
  *
  * Same as common_test_drupal_alter_alter(), but here, we verify that themes
  * can also alter and come last.
@@ -166,7 +166,7 @@ function bartik_drupal_alter_alter(&$data, &$arg2 = NULL, &$arg3 = NULL) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function common_test_theme() {
   return array(
@@ -184,7 +184,7 @@ function theme_common_test_foo($variables) {
 }
 
 /**
- * Implements hook_library_alter().
+ * @implements hook_library_alter().
  */
 function common_test_library_alter(&$libraries, $module) {
   if ($module == 'system' && isset($libraries['farbtastic'])) {
@@ -196,7 +196,7 @@ function common_test_library_alter(&$libraries, $module) {
 }
 
 /**
- * Implements hook_library().
+ * @implements hook_library().
  *
  * Adds Farbtastic in a different version.
  */
diff --git a/modules/simpletest/tests/database_test.install b/modules/simpletest/tests/database_test.install
index 4dce2b1..05be02c 100644
--- a/modules/simpletest/tests/database_test.install
+++ b/modules/simpletest/tests/database_test.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  *
  * The database tests use the database API which depends on schema
  * information for certain operations on certain databases.
diff --git a/modules/simpletest/tests/database_test.module b/modules/simpletest/tests/database_test.module
index 6fac319..364b7a2 100644
--- a/modules/simpletest/tests/database_test.module
+++ b/modules/simpletest/tests/database_test.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_query_alter().
+ * @implements hook_query_alter().
  */
 function database_test_query_alter(QueryAlterableInterface $query) {
 
@@ -33,7 +33,7 @@ function database_test_query_alter(QueryAlterableInterface $query) {
 
 
 /**
- * Implements hook_query_TAG_alter().
+ * @implements hook_query_TAG_alter().
  *
  * Called by DatabaseTestCase::testAlterRemoveRange.
  */
@@ -42,7 +42,7 @@ function database_test_query_database_test_alter_remove_range_alter(QueryAlterab
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function database_test_menu() {
   $items['database_test/db_query_temporary'] = array(
diff --git a/modules/simpletest/tests/entity_cache_test.module b/modules/simpletest/tests/entity_cache_test.module
index 5ae9ecc..e8743ed 100644
--- a/modules/simpletest/tests/entity_cache_test.module
+++ b/modules/simpletest/tests/entity_cache_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_watchdog().
+ * @implements hook_watchdog().
  *
  * This hook is called during module_enable() and since this hook
  * implementation is invoked, we have to expect that this module and dependent
diff --git a/modules/simpletest/tests/entity_cache_test_dependency.module b/modules/simpletest/tests/entity_cache_test_dependency.module
index 73a1149..af621e9 100644
--- a/modules/simpletest/tests/entity_cache_test_dependency.module
+++ b/modules/simpletest/tests/entity_cache_test_dependency.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_entity_info().
+ * @implements hook_entity_info().
  */
 function entity_cache_test_dependency_entity_info() {
   return array(
diff --git a/modules/simpletest/tests/entity_crud_hook_test.module b/modules/simpletest/tests/entity_crud_hook_test.module
index 873a162..09fb52f 100644
--- a/modules/simpletest/tests/entity_crud_hook_test.module
+++ b/modules/simpletest/tests/entity_crud_hook_test.module
@@ -5,49 +5,49 @@
 //
 
 /**
- * Implements hook_entity_presave().
+ * @implements hook_entity_presave().
  */
 function entity_crud_hook_test_entity_presave($entity, $type) {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called for type ' . $type);
 }
 
 /**
- * Implements hook_comment_presave().
+ * @implements hook_comment_presave().
  */
 function entity_crud_hook_test_comment_presave() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_file_presave().
+ * @implements hook_file_presave().
  */
 function entity_crud_hook_test_file_presave() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_node_presave().
+ * @implements hook_node_presave().
  */
 function entity_crud_hook_test_node_presave() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_taxonomy_term_presave().
+ * @implements hook_taxonomy_term_presave().
  */
 function entity_crud_hook_test_taxonomy_term_presave() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_taxonomy_vocabulary_presave().
+ * @implements hook_taxonomy_vocabulary_presave().
  */
 function entity_crud_hook_test_taxonomy_vocabulary_presave() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_user_presave().
+ * @implements hook_user_presave().
  */
 function entity_crud_hook_test_user_presave() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
@@ -58,49 +58,49 @@ function entity_crud_hook_test_user_presave() {
 //
 
 /**
- * Implements hook_entity_insert().
+ * @implements hook_entity_insert().
  */
 function entity_crud_hook_test_entity_insert($entity, $type) {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called for type ' . $type);
 }
 
 /**
- * Implements hook_comment_insert().
+ * @implements hook_comment_insert().
  */
 function entity_crud_hook_test_comment_insert() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_file_insert().
+ * @implements hook_file_insert().
  */
 function entity_crud_hook_test_file_insert() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function entity_crud_hook_test_node_insert() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_taxonomy_term_insert().
+ * @implements hook_taxonomy_term_insert().
  */
 function entity_crud_hook_test_taxonomy_term_insert() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_taxonomy_vocabulary_insert().
+ * @implements hook_taxonomy_vocabulary_insert().
  */
 function entity_crud_hook_test_taxonomy_vocabulary_insert() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_user_insert().
+ * @implements hook_user_insert().
  */
 function entity_crud_hook_test_user_insert() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
@@ -111,49 +111,49 @@ function entity_crud_hook_test_user_insert() {
 //
 
 /**
- * Implements hook_entity_load().
+ * @implements hook_entity_load().
  */
 function entity_crud_hook_test_entity_load(array $entities, $type) {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called for type ' . $type);
 }
 
 /**
- * Implements hook_comment_load().
+ * @implements hook_comment_load().
  */
 function entity_crud_hook_test_comment_load() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_file_load().
+ * @implements hook_file_load().
  */
 function entity_crud_hook_test_file_load() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_node_load().
+ * @implements hook_node_load().
  */
 function entity_crud_hook_test_node_load() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_taxonomy_term_load().
+ * @implements hook_taxonomy_term_load().
  */
 function entity_crud_hook_test_taxonomy_term_load() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_taxonomy_vocabulary_load().
+ * @implements hook_taxonomy_vocabulary_load().
  */
 function entity_crud_hook_test_taxonomy_vocabulary_load() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_user_load().
+ * @implements hook_user_load().
  */
 function entity_crud_hook_test_user_load() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
@@ -164,49 +164,49 @@ function entity_crud_hook_test_user_load() {
 //
 
 /**
- * Implements hook_entity_update().
+ * @implements hook_entity_update().
  */
 function entity_crud_hook_test_entity_update($entity, $type) {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called for type ' . $type);
 }
 
 /**
- * Implements hook_comment_update().
+ * @implements hook_comment_update().
  */
 function entity_crud_hook_test_comment_update() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_file_update().
+ * @implements hook_file_update().
  */
 function entity_crud_hook_test_file_update() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_node_update().
+ * @implements hook_node_update().
  */
 function entity_crud_hook_test_node_update() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_taxonomy_term_update().
+ * @implements hook_taxonomy_term_update().
  */
 function entity_crud_hook_test_taxonomy_term_update() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_taxonomy_vocabulary_update().
+ * @implements hook_taxonomy_vocabulary_update().
  */
 function entity_crud_hook_test_taxonomy_vocabulary_update() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_user_update().
+ * @implements hook_user_update().
  */
 function entity_crud_hook_test_user_update() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
@@ -217,49 +217,49 @@ function entity_crud_hook_test_user_update() {
 //
 
 /**
- * Implements hook_entity_delete().
+ * @implements hook_entity_delete().
  */
 function entity_crud_hook_test_entity_delete($entity, $type) {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called for type ' . $type);
 }
 
 /**
- * Implements hook_comment_delete().
+ * @implements hook_comment_delete().
  */
 function entity_crud_hook_test_comment_delete() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_file_delete().
+ * @implements hook_file_delete().
  */
 function entity_crud_hook_test_file_delete() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function entity_crud_hook_test_node_delete() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_taxonomy_term_delete().
+ * @implements hook_taxonomy_term_delete().
  */
 function entity_crud_hook_test_taxonomy_term_delete() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_taxonomy_vocabulary_delete().
+ * @implements hook_taxonomy_vocabulary_delete().
  */
 function entity_crud_hook_test_taxonomy_vocabulary_delete() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
 }
 
 /**
- * Implements hook_user_delete().
+ * @implements hook_user_delete().
  */
 function entity_crud_hook_test_user_delete() {
   $_SESSION['entity_crud_hook_test'][] = (__FUNCTION__ . ' called');
diff --git a/modules/simpletest/tests/error_test.module b/modules/simpletest/tests/error_test.module
index d062cb0..6a26526 100644
--- a/modules/simpletest/tests/error_test.module
+++ b/modules/simpletest/tests/error_test.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function error_test_menu() {
   $items['error-test/generate-warnings'] = array(
diff --git a/modules/simpletest/tests/file_test.module b/modules/simpletest/tests/file_test.module
index 2865a1f..26ebdfa 100644
--- a/modules/simpletest/tests/file_test.module
+++ b/modules/simpletest/tests/file_test.module
@@ -14,7 +14,7 @@ define('FILE_URL_TEST_CDN_2', 'http://cdn2.example.com');
 
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function file_test_menu() {
   $items['file-test/upload'] = array(
@@ -28,7 +28,7 @@ function file_test_menu() {
 }
 
 /**
- * Implements hook_stream_wrappers().
+ * @implements hook_stream_wrappers().
  */
 function file_test_stream_wrappers() {
   return array(
@@ -242,7 +242,7 @@ function file_test_set_return($op, $value) {
 }
 
 /**
- * Implements hook_file_load().
+ * @implements hook_file_load().
  */
 function file_test_file_load($files) {
   foreach ($files as $file) {
@@ -254,7 +254,7 @@ function file_test_file_load($files) {
 }
 
 /**
- * Implements hook_file_validate().
+ * @implements hook_file_validate().
  */
 function file_test_file_validate($file) {
   _file_test_log_call('validate', array($file));
@@ -262,7 +262,7 @@ function file_test_file_validate($file) {
 }
 
 /**
- * Implements hook_file_download().
+ * @implements hook_file_download().
  */
 function file_test_file_download($uri) {
   _file_test_log_call('download', array($uri));
@@ -270,42 +270,42 @@ function file_test_file_download($uri) {
 }
 
 /**
- * Implements hook_file_insert().
+ * @implements hook_file_insert().
  */
 function file_test_file_insert($file) {
   _file_test_log_call('insert', array($file));
 }
 
 /**
- * Implements hook_file_update().
+ * @implements hook_file_update().
  */
 function file_test_file_update($file) {
   _file_test_log_call('update', array($file));
 }
 
 /**
- * Implements hook_file_copy().
+ * @implements hook_file_copy().
  */
 function file_test_file_copy($file, $source) {
   _file_test_log_call('copy', array($file, $source));
 }
 
 /**
- * Implements hook_file_move().
+ * @implements hook_file_move().
  */
 function file_test_file_move($file, $source) {
   _file_test_log_call('move', array($file, $source));
 }
 
 /**
- * Implements hook_file_delete().
+ * @implements hook_file_delete().
  */
 function file_test_file_delete($file) {
   _file_test_log_call('delete', array($file));
 }
 
 /**
- * Implements hook_file_url_alter().
+ * @implements hook_file_url_alter().
  */
 function file_test_file_url_alter(&$uri) {
   // Only run this hook when this variable is set. Otherwise, we'd have to add
@@ -399,7 +399,7 @@ function file_test_file_url_alter(&$uri) {
 }
 
 /**
- * Implements hook_file_mimetype_mapping_alter().
+ * @implements hook_file_mimetype_mapping_alter().
  */
 function file_test_file_mimetype_mapping_alter(&$mapping) {
   // Add new mappings.
diff --git a/modules/simpletest/tests/filter_test.module b/modules/simpletest/tests/filter_test.module
index 2cebc70..85f84ec 100644
--- a/modules/simpletest/tests/filter_test.module
+++ b/modules/simpletest/tests/filter_test.module
@@ -6,28 +6,28 @@
  */
 
 /**
- * Implements hook_filter_format_insert().
+ * @implements hook_filter_format_insert().
  */
 function filter_test_filter_format_insert($format) {
   drupal_set_message('hook_filter_format_insert invoked.');
 }
 
 /**
- * Implements hook_filter_format_update().
+ * @implements hook_filter_format_update().
  */
 function filter_test_filter_format_update($format) {
   drupal_set_message('hook_filter_format_update invoked.');
 }
 
 /**
- * Implements hook_filter_format_disable().
+ * @implements hook_filter_format_disable().
  */
 function filter_test_filter_format_disable($format) {
   drupal_set_message('hook_filter_format_disable invoked.');
 }
 
 /**
- * Implements hook_filter_info().
+ * @implements hook_filter_info().
  */
 function filter_test_filter_info() {
   $filters['filter_test_uncacheable'] = array(
diff --git a/modules/simpletest/tests/form_test.module b/modules/simpletest/tests/form_test.module
index 00be7d2..d76c81c 100644
--- a/modules/simpletest/tests/form_test.module
+++ b/modules/simpletest/tests/form_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function form_test_menu() {
   $items['form-test/alter'] = array(
@@ -218,14 +218,14 @@ function form_test_alter_form($form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter() on behalf of block.module.
+ * @implements hook_form_FORM_ID_alter() on behalf of block.module.
  */
 function block_form_form_test_alter_form_alter(&$form, &$form_state) {
   drupal_set_message('block_form_form_test_alter_form_alter() executed.');
 }
 
 /**
- * Implements hook_form_alter().
+ * @implements hook_form_alter().
  */
 function form_test_form_alter(&$form, &$form_state, $form_id) {
   if ($form_id == 'form_test_alter_form') {
@@ -234,14 +234,14 @@ function form_test_form_alter(&$form, &$form_state, $form_id) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function form_test_form_form_test_alter_form_alter(&$form, &$form_state) {
   drupal_set_message('form_test_form_form_test_alter_form_alter() executed.');
 }
 
 /**
- * Implements hook_form_FORM_ID_alter() on behalf of system.module.
+ * @implements hook_form_FORM_ID_alter() on behalf of system.module.
  */
 function system_form_form_test_alter_form_alter(&$form, &$form_state) {
   drupal_set_message('system_form_form_test_alter_form_alter() executed.');
@@ -1358,7 +1358,7 @@ function form_test_state_persist_submit($form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  *
  * @see form_test_state_persist()
  */
@@ -1527,7 +1527,7 @@ function form_test_clicked_button_submit($form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter() for the registration form.
+ * @implements hook_form_FORM_ID_alter() for the registration form.
  */
 function form_test_form_user_register_form_alter(&$form, &$form_state) {
   $form['test_rebuild'] = array(
diff --git a/modules/simpletest/tests/image_test.module b/modules/simpletest/tests/image_test.module
index de640f0..fdd9d31 100644
--- a/modules/simpletest/tests/image_test.module
+++ b/modules/simpletest/tests/image_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_image_toolkits().
+ * @implements hook_image_toolkits().
  */
 function image_test_image_toolkits() {
   return array(
diff --git a/modules/simpletest/tests/menu_test.module b/modules/simpletest/tests/menu_test.module
index 3046a04..b054fbe 100644
--- a/modules/simpletest/tests/menu_test.module
+++ b/modules/simpletest/tests/menu_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function menu_test_menu() {
   // The name of the menu changes during the course of the test. Using a $_GET.
@@ -427,7 +427,7 @@ function menu_test_menu_name($new_name = '') {
 }
 
 /**
- * Implements hook_menu_link_insert().
+ * @implements hook_menu_link_insert().
  *
  * @return
  *  A random string.
@@ -437,7 +437,7 @@ function menu_test_menu_link_insert($item) {
 }
 
 /**
- * Implements hook_menu_link_update().
+ * @implements hook_menu_link_update().
  *
  * @return
  *  A random string.
@@ -447,7 +447,7 @@ function menu_test_menu_link_update($item) {
 }
 
 /**
- * Implements hook_menu_link_delete().
+ * @implements hook_menu_link_delete().
  *
  * @return
  *  A random string.
@@ -473,7 +473,7 @@ function menu_test_static_variable($value = NULL) {
 }
 
 /**
- * Implements hook_menu_site_status_alter().
+ * @implements hook_menu_site_status_alter().
  */
 function menu_test_menu_site_status_alter(&$menu_site_status, $path) {
   // Allow access to ?q=menu_login_callback even if in maintenance mode.
diff --git a/modules/simpletest/tests/module_test.file.inc b/modules/simpletest/tests/module_test.file.inc
index c0d3ec4..cd3b6c7 100644
--- a/modules/simpletest/tests/module_test.file.inc
+++ b/modules/simpletest/tests/module_test.file.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_test_hook().
+ * @implements hook_test_hook().
  */
 function module_test_test_hook() {
   return array('module_test' => 'success!');
diff --git a/modules/simpletest/tests/module_test.install b/modules/simpletest/tests/module_test.install
index 4cc09df..27914ec 100644
--- a/modules/simpletest/tests/module_test.install
+++ b/modules/simpletest/tests/module_test.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function module_test_schema() {
   $schema['module_test'] = array(
@@ -25,7 +25,7 @@ function module_test_schema() {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function module_test_install() {
   $record = array('data' => 'Data inserted in hook_install()');
@@ -33,7 +33,7 @@ function module_test_install() {
 }
 
 /**
- * Implements hook_enable().
+ * @implements hook_enable().
  */
 function module_test_enable() {
   $record = array('data' => 'Data inserted in hook_enable()');
diff --git a/modules/simpletest/tests/module_test.module b/modules/simpletest/tests/module_test.module
index bd85049..d05e727 100644
--- a/modules/simpletest/tests/module_test.module
+++ b/modules/simpletest/tests/module_test.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function module_test_permission() {
   return array(
@@ -10,7 +10,7 @@ function module_test_permission() {
 }
 
 /**
- * Implements hook_system_info_alter().
+ * @implements hook_system_info_alter().
  *
  * Manipulate module dependencies to test dependency chains.
  */
@@ -55,7 +55,7 @@ function module_test_system_info_alter(&$info, $file, $type) {
 }
 
 /**
- * Implements hook_hook_info().
+ * @implements hook_hook_info().
  */
 function module_test_hook_info() {
   $hooks['test_hook'] = array(
@@ -65,7 +65,7 @@ function module_test_hook_info() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function module_test_menu() {
   $items['module-test/hook-dynamic-loading-invoke'] = array(
@@ -104,7 +104,7 @@ function module_test_hook_dynamic_loading_invoke_all() {
 }
 
 /**
- * Implements hook_modules_enabled().
+ * @implements hook_modules_enabled().
  */
 function module_test_modules_enabled($modules) {
   // Record the ordered list of modules that were passed in to this hook so we
@@ -113,7 +113,7 @@ function module_test_modules_enabled($modules) {
 }
 
 /**
- * Implements hook_modules_disabled().
+ * @implements hook_modules_disabled().
  */
 function module_test_modules_disabled($modules) {
   // Record the ordered list of modules that were passed in to this hook so we
@@ -122,7 +122,7 @@ function module_test_modules_disabled($modules) {
 }
 
 /**
- * Implements hook_modules_uninstalled().
+ * @implements hook_modules_uninstalled().
  */
 function module_test_modules_uninstalled($modules) {
   // Record the ordered list of modules that were passed in to this hook so we
diff --git a/modules/simpletest/tests/requirements1_test.install b/modules/simpletest/tests/requirements1_test.install
index 651d911..d2a5fb8 100644
--- a/modules/simpletest/tests/requirements1_test.install
+++ b/modules/simpletest/tests/requirements1_test.install
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_requirements().
+ * @implements hook_requirements().
  */
 function requirements1_test_requirements($phase) {
   $requirements = array();
diff --git a/modules/simpletest/tests/session_test.module b/modules/simpletest/tests/session_test.module
index 689ff09..2bf156b 100644
--- a/modules/simpletest/tests/session_test.module
+++ b/modules/simpletest/tests/session_test.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function session_test_menu() {
   $items['session-test/get'] = array(
@@ -65,7 +65,7 @@ function session_test_menu() {
 }
 
 /**
- * Implements hook_boot().
+ * @implements hook_boot().
  */
 function session_test_boot() {
   header('X-Session-Empty: ' . intval(empty($_SESSION)));
@@ -151,7 +151,7 @@ function _session_test_set_not_started() {
 }
 
 /**
- * Implements hook_user().
+ * @implements hook_user().
  */
 function session_test_user_login($edit = array(), $user = NULL) {
   if ($user->name == 'session_test_user') {
@@ -162,14 +162,14 @@ function session_test_user_login($edit = array(), $user = NULL) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function session_test_form_user_login_alter(&$form) {
   $form['#https'] = TRUE;
 }
 
 /**
- * Implements hook_drupal_goto_alter().
+ * @implements hook_drupal_goto_alter().
  *
  * Force the redirection to go to a non-secure page after being on a secure
  * page through https.php.
diff --git a/modules/simpletest/tests/system_test.module b/modules/simpletest/tests/system_test.module
index 46fb876..cb6fda5 100644
--- a/modules/simpletest/tests/system_test.module
+++ b/modules/simpletest/tests/system_test.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function system_test_menu() {
   $items['system-test/sleep/%'] = array(
@@ -143,7 +143,7 @@ function system_test_redirect_invalid_scheme() {
 }
 
 /**
- * Implements hook_modules_installed().
+ * @implements hook_modules_installed().
  */
 function system_test_modules_installed($modules) {
   if (in_array('aggregator', $modules)) {
@@ -152,7 +152,7 @@ function system_test_modules_installed($modules) {
 }
 
 /**
- * Implements hook_modules_enabled().
+ * @implements hook_modules_enabled().
  */
 function system_test_modules_enabled($modules) {
   if (in_array('aggregator', $modules)) {
@@ -161,7 +161,7 @@ function system_test_modules_enabled($modules) {
 }
 
 /**
- * Implements hook_modules_disabled().
+ * @implements hook_modules_disabled().
  */
 function system_test_modules_disabled($modules) {
   if (in_array('aggregator', $modules)) {
@@ -170,7 +170,7 @@ function system_test_modules_disabled($modules) {
 }
 
 /**
- * Implements hook_modules_uninstalled().
+ * @implements hook_modules_uninstalled().
  */
 function system_test_modules_uninstalled($modules) {
   if (in_array('aggregator', $modules)) {
@@ -179,14 +179,14 @@ function system_test_modules_uninstalled($modules) {
 }
 
 /**
- * Implements hook_boot().
+ * @implements hook_boot().
  */
 function system_test_boot() {
   watchdog('system_test', 'hook_boot');
 }
 
 /**
- * Implements hook_init().
+ * @implements hook_init().
  */
 function system_test_init() {
   // Used by FrontPageTestCase to get the results of drupal_is_front_page().
@@ -196,14 +196,14 @@ function system_test_init() {
 }
 
 /**
- * Implements hook_exit().
+ * @implements hook_exit().
  */
 function system_test_exit() {
   watchdog('system_test', 'hook_exit');
 }
 
 /**
- * Implements hook_system_info_alter().
+ * @implements hook_system_info_alter().
  */
 function system_test_system_info_alter(&$info, $file, $type) {
   // We need a static otherwise the last test will fail to alter common_test.
@@ -258,7 +258,7 @@ function system_test_lock_exit() {
 }
 
 /**
- * Implements hook_page_build().
+ * @implements hook_page_build().
  */
 function system_test_page_build(&$page) {
   $menu_item = menu_get_item();
@@ -317,7 +317,7 @@ function _system_test_second_shutdown_function($arg1, $arg2) {
 }
 
 /**
- * Implements hook_filetransfer_info().
+ * @implements hook_filetransfer_info().
  */
 function system_test_filetransfer_info() {
   return array(
diff --git a/modules/simpletest/tests/taxonomy_test.install b/modules/simpletest/tests/taxonomy_test.install
index d5c94da..0990ca5 100644
--- a/modules/simpletest/tests/taxonomy_test.install
+++ b/modules/simpletest/tests/taxonomy_test.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function taxonomy_test_schema() {
   $schema['taxonomy_term_antonym'] = array(
diff --git a/modules/simpletest/tests/taxonomy_test.module b/modules/simpletest/tests/taxonomy_test.module
index aae13a2..bc1298d 100644
--- a/modules/simpletest/tests/taxonomy_test.module
+++ b/modules/simpletest/tests/taxonomy_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_taxonomy_term_load().
+ * @implements hook_taxonomy_term_load().
  */
 function taxonomy_test_taxonomy_term_load($terms) {
   foreach ($terms as $term) {
@@ -18,7 +18,7 @@ function taxonomy_test_taxonomy_term_load($terms) {
 }
 
 /**
- * Implements hook_taxonomy_term_insert().
+ * @implements hook_taxonomy_term_insert().
  */
 function taxonomy_test_taxonomy_term_insert($term) {
   if (!empty($term->antonym)) {
@@ -32,7 +32,7 @@ function taxonomy_test_taxonomy_term_insert($term) {
 }
 
 /**
- * Implements hook_taxonomy_term_update().
+ * @implements hook_taxonomy_term_update().
  */
 function taxonomy_test_taxonomy_term_update($term) {
   if (!empty($term->antonym)) {
@@ -46,7 +46,7 @@ function taxonomy_test_taxonomy_term_update($term) {
 }
 
 /**
- * Implements hook_taxonomy_term_delete().
+ * @implements hook_taxonomy_term_delete().
  */
 function taxonomy_test_taxonomy_term_delete($term) {
   db_delete('taxonomy_term_antonym')
@@ -55,7 +55,7 @@ function taxonomy_test_taxonomy_term_delete($term) {
 }
 
 /**
- * Implements hook_form_alter().
+ * @implements hook_form_alter().
  */
 function taxonomy_test_form_alter(&$form, $form_state, $form_id) {
   if ($form_id == 'taxonomy_form_term') {
diff --git a/modules/simpletest/tests/theme_test.module b/modules/simpletest/tests/theme_test.module
index 160d192..031feba 100644
--- a/modules/simpletest/tests/theme_test.module
+++ b/modules/simpletest/tests/theme_test.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function theme_test_menu() {
   $items['theme-test/suggestion'] = array(
@@ -27,7 +27,7 @@ function theme_test_menu() {
 }
 
 /**
- * Implements hook_init().
+ * @implements hook_init().
  */
 function theme_test_init() {
   if (arg(0) == 'theme-test' && arg(1) == 'hook-init') {
@@ -44,7 +44,7 @@ function theme_test_init() {
 }
 
 /**
- * Implements hook_exit().
+ * @implements hook_exit().
  */
 function theme_test_exit() {
   if (arg(0) == 'user') {
@@ -97,7 +97,7 @@ function _theme_test_suggestion() {
 }
 
 /**
- * Implements hook_preprocess_breadcrumb().
+ * @implements hook_preprocess_breadcrumb().
  *
  * Set a variable that can later be tested to see if this function ran.
  */
diff --git a/modules/simpletest/tests/update_test_1.install b/modules/simpletest/tests/update_test_1.install
index 22398a3..7802883 100644
--- a/modules/simpletest/tests/update_test_1.install
+++ b/modules/simpletest/tests/update_test_1.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_update_dependencies().
+ * @implements hook_update_dependencies().
  *
  * @see update_test_2_update_dependencies()
  */
diff --git a/modules/simpletest/tests/update_test_2.install b/modules/simpletest/tests/update_test_2.install
index c73271a..6123598 100644
--- a/modules/simpletest/tests/update_test_2.install
+++ b/modules/simpletest/tests/update_test_2.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_update_dependencies().
+ * @implements hook_update_dependencies().
  *
  * @see update_test_1_update_dependencies()
  * @see update_test_3_update_dependencies()
diff --git a/modules/simpletest/tests/update_test_3.install b/modules/simpletest/tests/update_test_3.install
index 96830c8..239fc00 100644
--- a/modules/simpletest/tests/update_test_3.install
+++ b/modules/simpletest/tests/update_test_3.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_update_dependencies().
+ * @implements hook_update_dependencies().
  *
  * @see update_test_2_update_dependencies()
  */
diff --git a/modules/simpletest/tests/url_alter_test.module b/modules/simpletest/tests/url_alter_test.module
index e229ab9..953694e 100644
--- a/modules/simpletest/tests/url_alter_test.module
+++ b/modules/simpletest/tests/url_alter_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function url_alter_test_menu() {
   $items['url-alter-test/foo'] = array(
@@ -27,7 +27,7 @@ function url_alter_test_foo() {
 }
 
 /**
- * Implements hook_url_inbound_alter().
+ * @implements hook_url_inbound_alter().
  */
 function url_alter_test_url_inbound_alter(&$path, $original_path, $path_language) {
   // Rewrite user/username to user/uid.
@@ -49,7 +49,7 @@ function url_alter_test_url_inbound_alter(&$path, $original_path, $path_language
 }
 
 /**
- * Implements hook_url_outbound_alter().
+ * @implements hook_url_outbound_alter().
  */
 function url_alter_test_url_outbound_alter(&$path, &$options, $original_path) {
   // Rewrite user/uid to user/username.
diff --git a/modules/simpletest/tests/xmlrpc_test.module b/modules/simpletest/tests/xmlrpc_test.module
index db8f113..9045d12 100644
--- a/modules/simpletest/tests/xmlrpc_test.module
+++ b/modules/simpletest/tests/xmlrpc_test.module
@@ -46,7 +46,7 @@ function xmlrpc_test_simpleStructReturnTest($number) {
 }
 
 /**
- * Implements hook_xmlrpc().
+ * @implements hook_xmlrpc().
  */
 function xmlrpc_test_xmlrpc() {
   return array(
@@ -63,7 +63,7 @@ function xmlrpc_test_xmlrpc() {
 }
 
 /**
- * Implements hook_xmlrpc_alter().
+ * @implements hook_xmlrpc_alter().
  *
  * Hide (or not) the system.methodSignature() service depending on a variable.
  */
diff --git a/modules/statistics/statistics.install b/modules/statistics/statistics.install
index a5dc7f8..8fcd476 100644
--- a/modules/statistics/statistics.install
+++ b/modules/statistics/statistics.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function statistics_uninstall() {
   // Remove variables.
@@ -20,7 +20,7 @@ function statistics_uninstall() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function statistics_schema() {
   $schema['accesslog'] = array(
diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module
index 6b7be8a..2d1d961 100644
--- a/modules/statistics/statistics.module
+++ b/modules/statistics/statistics.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function statistics_help($path, $arg) {
   switch ($path) {
@@ -43,7 +43,7 @@ function statistics_help($path, $arg) {
 
 
 /**
- * Implements hook_exit().
+ * @implements hook_exit().
  *
  * This is where statistics are gathered on page accesses.
  */
@@ -92,7 +92,7 @@ function statistics_exit() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function statistics_permission() {
   return array(
@@ -109,7 +109,7 @@ function statistics_permission() {
 }
 
 /**
- * Implements hook_node_view().
+ * @implements hook_node_view().
  */
 function statistics_node_view($node, $view_mode) {
   if ($view_mode != 'rss') {
@@ -128,7 +128,7 @@ function statistics_node_view($node, $view_mode) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function statistics_menu() {
   $items['admin/reports/hits'] = array(
@@ -201,7 +201,7 @@ function statistics_menu() {
 }
 
 /**
- * Implements hook_user_cancel().
+ * @implements hook_user_cancel().
  */
 function statistics_user_cancel($edit, $account, $method) {
   switch ($method) {
@@ -215,7 +215,7 @@ function statistics_user_cancel($edit, $account, $method) {
 }
 
 /**
- * Implements hook_user_delete().
+ * @implements hook_user_delete().
  */
 function statistics_user_delete($account) {
   db_delete('accesslog')
@@ -224,7 +224,7 @@ function statistics_user_delete($account) {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  */
 function statistics_cron() {
   $statistics_timestamp = variable_get('statistics_day_timestamp', '');
@@ -303,7 +303,7 @@ function statistics_get($nid) {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function statistics_block_info() {
   $blocks = array();
@@ -317,7 +317,7 @@ function statistics_block_info() {
 }
 
 /**
- * Implements hook_block_configure().
+ * @implements hook_block_configure().
  */
 function statistics_block_configure($delta = '') {
   // Popular content block settings
@@ -329,7 +329,7 @@ function statistics_block_configure($delta = '') {
 }
 
 /**
- * Implements hook_block_save().
+ * @implements hook_block_save().
  */
 function statistics_block_save($delta = '', $edit = array()) {
   variable_set('statistics_block_top_day_num', $edit['statistics_block_top_day_num']);
@@ -338,7 +338,7 @@ function statistics_block_save($delta = '', $edit = array()) {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  */
 function statistics_block_view($delta = '') {
   if (user_access('access content')) {
@@ -388,7 +388,7 @@ function _statistics_format_item($title, $path) {
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function statistics_node_delete($node) {
   // clean up statistics table when node is deleted
@@ -398,7 +398,7 @@ function statistics_node_delete($node) {
 }
 
 /**
- * Implements hook_ranking().
+ * @implements hook_ranking().
  */
 function statistics_ranking() {
   if (variable_get('statistics_count_content_views', 0)) {
@@ -420,7 +420,7 @@ function statistics_ranking() {
 }
 
 /**
- * Implements hook_update_index().
+ * @implements hook_update_index().
  */
 function statistics_update_index() {
   variable_set('node_cron_views_scale', 1.0 / max(1, db_query('SELECT MAX(totalcount) FROM {node_counter}')->fetchField()));
diff --git a/modules/statistics/statistics.tokens.inc b/modules/statistics/statistics.tokens.inc
index c2c8fc3..f6af1c3 100644
--- a/modules/statistics/statistics.tokens.inc
+++ b/modules/statistics/statistics.tokens.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_token_info().
+ * @implements hook_token_info().
  */
 function statistics_token_info() {
   $node['total-count'] = array(
@@ -29,7 +29,7 @@ function statistics_token_info() {
 }
 
 /**
- * Implements hook_tokens().
+ * @implements hook_tokens().
  */
 function statistics_tokens($type, $tokens, array $data = array(), array $options = array()) {
   $url_options = array('absolute' => TRUE);
diff --git a/modules/syslog/syslog.install b/modules/syslog/syslog.install
index 12ff4fb..04e84d9 100644
--- a/modules/syslog/syslog.install
+++ b/modules/syslog/syslog.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function syslog_uninstall() {
   variable_del('syslog_identity');
diff --git a/modules/syslog/syslog.module b/modules/syslog/syslog.module
index c4ee382..99e5c4f 100644
--- a/modules/syslog/syslog.module
+++ b/modules/syslog/syslog.module
@@ -13,7 +13,7 @@ else {
 }
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function syslog_help($path, $arg) {
   switch ($path) {
@@ -33,7 +33,7 @@ function syslog_help($path, $arg) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function syslog_form_system_logging_settings_alter(&$form, &$form_state) {
   $help = module_exists('help') ? ' ' . l(t('More information'), 'admin/help/syslog') . '.' : NULL;
@@ -80,7 +80,7 @@ function syslog_facility_list() {
 }
 
 /**
- * Implements hook_watchdog().
+ * @implements hook_watchdog().
  */
 function syslog_watchdog(array $log_entry) {
   global $base_url;
diff --git a/modules/system/system.install b/modules/system/system.install
index 6d2fc80..2f4eb36 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -490,7 +490,7 @@ function system_requirements($phase) {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function system_install() {
   // Create tables.
@@ -521,7 +521,7 @@ function system_install() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function system_schema() {
   // NOTE: {variable} needs to be created before all other tables, as
diff --git a/modules/system/system.module b/modules/system/system.module
index 21b23f4..c4be7a7 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -60,7 +60,7 @@ define('REGIONS_VISIBLE', 'visible');
 define('REGIONS_ALL', 'all');
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function system_help($path, $arg) {
   global $base_url;
@@ -142,7 +142,7 @@ function system_help($path, $arg) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function system_theme() {
   return array_merge(drupal_common_theme(), array(
@@ -202,7 +202,7 @@ function system_theme() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function system_permission() {
   return array(
@@ -243,7 +243,7 @@ function system_permission() {
 }
 
 /**
- * Implements hook_hook_info().
+ * @implements hook_hook_info().
  */
 function system_hook_info() {
   $hooks['token_info'] = array(
@@ -263,7 +263,7 @@ function system_hook_info() {
 }
 
 /**
- * Implements hook_entity_info().
+ * @implements hook_entity_info().
  */
 function system_entity_info() {
   return array(
@@ -280,7 +280,7 @@ function system_entity_info() {
 }
 
 /**
- * Implements hook_element_info().
+ * @implements hook_element_info().
  */
 function system_element_info() {
   // Top level elements.
@@ -507,7 +507,7 @@ function system_element_info() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function system_menu() {
   $items['system/files'] = array(
@@ -1075,7 +1075,7 @@ function _system_batch_theme() {
 }
 
 /**
- * Implements hook_library().
+ * @implements hook_library().
  */
 function system_library() {
   // Drupal's Ajax framework.
@@ -1638,7 +1638,7 @@ function system_library() {
 }
 
 /**
- * Implements hook_stream_wrappers().
+ * @implements hook_stream_wrappers().
  */
 function system_stream_wrappers() {
   $wrappers = array(
@@ -1815,7 +1815,7 @@ function system_authorized_batch_process() {
  */
 
 /**
- * Implements hook_updater_info().
+ * @implements hook_updater_info().
  */
 function system_updater_info() {
   return array(
@@ -1833,7 +1833,7 @@ function system_updater_info() {
 }
 
 /**
- * Implements hook_filetransfer_info().
+ * @implements hook_filetransfer_info().
  */
 function system_filetransfer_info() {
   $backends = array();
@@ -1864,7 +1864,7 @@ function system_filetransfer_info() {
 }
 
 /**
- * Implements hook_init().
+ * @implements hook_init().
  */
 function system_init() {
   $path = drupal_get_path('module', 'system');
@@ -1925,7 +1925,7 @@ function system_add_module_assets() {
 }
 
 /**
- * Implements hook_custom_theme().
+ * @implements hook_custom_theme().
  */
 function system_custom_theme() {
   if (user_access('view the administration theme') && path_is_admin(current_path())) {
@@ -1934,7 +1934,7 @@ function system_custom_theme() {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function system_form_user_profile_form_alter(&$form, &$form_state) {
   if ($form['#user_category'] == 'account') {
@@ -1946,7 +1946,7 @@ function system_form_user_profile_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function system_form_user_register_form_alter(&$form, &$form_state) {
   if (variable_get('configurable_timezones', 1)) {
@@ -1964,7 +1964,7 @@ function system_form_user_register_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_user_login().
+ * @implements hook_user_login().
  */
 function system_user_login(&$edit, $account) {
   // If the user has a NULL time zone, notify them to set a time zone.
@@ -2002,7 +2002,7 @@ function system_user_timezone(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function system_block_info() {
   $blocks['main'] = array(
@@ -2030,7 +2030,7 @@ function system_block_info() {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  *
  * Generate a block with a promotional link to Drupal.org and
  * all system menu blocks.
@@ -2063,7 +2063,7 @@ function system_block_view($delta = '') {
 }
 
 /**
- * Implements hook_preprocess_block().
+ * @implements hook_preprocess_block().
  */
 function system_preprocess_block(&$variables) {
   // System menu blocks should get the same class as menu module blocks.
@@ -2689,7 +2689,7 @@ function system_region_list($theme_key, $show = REGIONS_ALL) {
 }
 
 /**
- * Implements hook_system_info_alter().
+ * @implements hook_system_info_alter().
  */
 function system_system_info_alter(&$info, $file, $type) {
   // Remove page-top from the blocks UI since it is reserved for modules to
@@ -2965,7 +2965,7 @@ function system_get_module_admin_tasks($module, $info) {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  *
  * Remove older rows from flood and batch table. Remove old temporary files.
  */
@@ -3022,7 +3022,7 @@ function system_cron() {
 }
 
 /**
- * Implements hook_flush_caches().
+ * @implements hook_flush_caches().
  */
 function system_flush_caches() {
   // Rebuild list of date formats.
@@ -3032,7 +3032,7 @@ function system_flush_caches() {
 }
 
 /**
- * Implements hook_action_info().
+ * @implements hook_action_info().
  */
 function system_action_info() {
   return array(
@@ -3185,7 +3185,7 @@ function system_send_email_action($entity, $context) {
 }
 
 /**
- * Implements hook_mail().
+ * @implements hook_mail().
  */
 function system_mail($key, &$message, $params) {
   $context = $params['context'];
@@ -3368,7 +3368,7 @@ function theme_system_compact_link() {
 }
 
 /**
- * Implements hook_image_toolkits().
+ * @implements hook_image_toolkits().
  */
 function system_image_toolkits() {
   include_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'system') . '/' . 'image.gd.inc';
@@ -3436,7 +3436,7 @@ function system_retrieve_file($url, $destination = NULL, $managed = FALSE, $repl
 }
 
 /**
- * Implements hook_page_alter().
+ * @implements hook_page_alter().
  */
 function system_page_alter(&$page) {
   // Find all non-empty page regions, and add a theme wrapper function that
@@ -3497,7 +3497,7 @@ function system_get_date_types($type = NULL) {
 }
 
 /**
- * Implements hook_date_format_types().
+ * @implements hook_date_format_types().
  */
 function system_date_format_types() {
   return array(
@@ -3508,7 +3508,7 @@ function system_date_format_types() {
 }
 
 /**
- * Implements hook_date_formats().
+ * @implements hook_date_formats().
  */
 function system_date_formats() {
   include_once DRUPAL_ROOT . '/includes/date.inc';
@@ -3886,7 +3886,7 @@ function system_date_format_delete($dfid) {
 }
 
 /**
- * Implements hook_archiver_info().
+ * @implements hook_archiver_info().
  */
 function system_archiver_info() {
   $archivers['tar'] = array(
@@ -3964,7 +3964,7 @@ function theme_exposed_filters($variables) {
 }
 
 /**
- * Implements hook_admin_paths().
+ * @implements hook_admin_paths().
  */
 function system_admin_paths() {
   $paths = array(
diff --git a/modules/system/system.tokens.inc b/modules/system/system.tokens.inc
index 27d7dfd..c1d7872 100644
--- a/modules/system/system.tokens.inc
+++ b/modules/system/system.tokens.inc
@@ -9,7 +9,7 @@
  */
 
 /**
- * Implements hook_token_info().
+ * @implements hook_token_info().
  */
 function system_token_info() {
   $types['site'] = array(
@@ -130,7 +130,7 @@ function system_token_info() {
 }
 
 /**
- * Implements hook_tokens().
+ * @implements hook_tokens().
  */
 function system_tokens($type, $tokens, array $data = array(), array $options = array()) {
   $url_options = array('absolute' => TRUE);
diff --git a/modules/taxonomy/taxonomy.install b/modules/taxonomy/taxonomy.install
index 10009d6..0358e5a 100644
--- a/modules/taxonomy/taxonomy.install
+++ b/modules/taxonomy/taxonomy.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function taxonomy_uninstall() {
   // Remove variables.
@@ -15,7 +15,7 @@ function taxonomy_uninstall() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function taxonomy_schema() {
   $schema['taxonomy_term_data'] = array(
@@ -219,7 +219,7 @@ function taxonomy_schema() {
 }
 
 /**
- * Implements hook_field_schema().
+ * @implements hook_field_schema().
  */
 function taxonomy_field_schema($field) {
   return array(
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index d14a169..cc6dc88 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -14,7 +14,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function taxonomy_help($path, $arg) {
   switch ($path) {
@@ -62,7 +62,7 @@ function taxonomy_help($path, $arg) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function taxonomy_permission() {
   $permissions = array(
@@ -86,7 +86,7 @@ function taxonomy_permission() {
 }
 
 /**
- * Implements hook_entity_info().
+ * @implements hook_entity_info().
  */
 function taxonomy_entity_info() {
   $return = array(
@@ -149,7 +149,7 @@ function taxonomy_term_uri($term) {
 }
 
 /**
- * Implements hook_field_extra_fields().
+ * @implements hook_field_extra_fields().
  */
 function taxonomy_field_extra_fields() {
   $return = array();
@@ -236,7 +236,7 @@ function taxonomy_select_nodes($tid, $pager = TRUE, $limit = FALSE, $order = arr
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function taxonomy_theme() {
   return array(
@@ -254,7 +254,7 @@ function taxonomy_theme() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function taxonomy_menu() {
   $items['admin/structure/taxonomy'] = array(
@@ -356,7 +356,7 @@ function taxonomy_menu() {
 }
 
 /**
- * Implements hook_admin_paths().
+ * @implements hook_admin_paths().
  */
 function taxonomy_admin_paths() {
   $paths = array(
@@ -466,7 +466,7 @@ function taxonomy_vocabulary_delete($vid) {
 }
 
 /**
- * Implements hook_taxonomy_vocabulary_update().
+ * @implements hook_taxonomy_vocabulary_update().
  */
 function taxonomy_taxonomy_vocabulary_update($vocabulary) {
   // Reflect machine name changes in the definitions of existing 'taxonomy'
@@ -1196,7 +1196,7 @@ function taxonomy_implode_tags($tags, $vid = NULL) {
 }
 
 /**
- * Implements hook_field_info().
+ * @implements hook_field_info().
  *
  * Field settings:
  * - allowed_values: a list array of one or more vocabulary trees:
@@ -1226,7 +1226,7 @@ function taxonomy_field_info() {
 }
 
 /**
- * Implements hook_field_widget_info().
+ * @implements hook_field_widget_info().
  */
 function taxonomy_field_widget_info() {
   return array(
@@ -1245,7 +1245,7 @@ function taxonomy_field_widget_info() {
 }
 
 /**
- * Implements hook_field_widget_info_alter().
+ * @implements hook_field_widget_info_alter().
  */
 function taxonomy_field_widget_info_alter(&$info) {
   $info['options_select']['field types'][] = 'taxonomy_term_reference';
@@ -1253,7 +1253,7 @@ function taxonomy_field_widget_info_alter(&$info) {
 }
 
 /**
- * Implements hook_options_list().
+ * @implements hook_options_list().
  */
 function taxonomy_options_list($field) {
   $function = !empty($field['settings']['options_list_callback']) ? $field['settings']['options_list_callback'] : 'taxonomy_allowed_values';
@@ -1261,7 +1261,7 @@ function taxonomy_options_list($field) {
 }
 
 /**
- * Implements hook_field_validate().
+ * @implements hook_field_validate().
  *
  * Taxonomy field settings allow for either a single vocabulary ID, multiple
  * vocabulary IDs, or sub-trees of a vocabulary to be specified as allowed
@@ -1320,7 +1320,7 @@ function taxonomy_field_validate($entity_type, $entity, $field, $instance, $lang
 }
 
 /**
- * Implements hook_field_is_empty().
+ * @implements hook_field_is_empty().
  */
 function taxonomy_field_is_empty($item, $field) {
   if (!is_array($item) || (empty($item['tid']) && (string) $item['tid'] !== '0')) {
@@ -1330,7 +1330,7 @@ function taxonomy_field_is_empty($item, $field) {
 }
 
 /**
- * Implements hook_field_formatter_info().
+ * @implements hook_field_formatter_info().
  */
 function taxonomy_field_formatter_info() {
   return array(
@@ -1346,7 +1346,7 @@ function taxonomy_field_formatter_info() {
 }
 
 /**
- * Implements hook_field_formatter_view().
+ * @implements hook_field_formatter_view().
  */
 function taxonomy_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
@@ -1412,7 +1412,7 @@ function taxonomy_allowed_values($field) {
 }
 
 /**
- * Implements hook_field_formatter_prepare_view().
+ * @implements hook_field_formatter_prepare_view().
  *
  * This preloads all taxonomy terms for multiple loaded objects at once and
  * unsets values for invalid terms that do not exist.
@@ -1475,7 +1475,7 @@ function taxonomy_term_title($term) {
 }
 
 /**
- * Implements hook_field_widget_form().
+ * @implements hook_field_widget_form().
  */
 function taxonomy_field_widget_form(&$form, &$form_state, $field, $instance, $langcode, $items, $delta, $element) {
   $tags = array();
@@ -1537,13 +1537,13 @@ function taxonomy_autocomplete_validate($element, &$form_state) {
 }
 
 /**
- * Implements hook_field_widget_error().
+ * @implements hook_field_widget_error().
  */
 function taxonomy_field_widget_error($element, $error, $form, &$form_state) {
   form_error($element, $error['message']);
 }
 /**
- * Implements hook_field_settings_form().
+ * @implements hook_field_settings_form().
  */
 function taxonomy_field_settings_form($field, $instance, $has_data) {
   // Get proper values for 'allowed_values_function', which is a core setting.
@@ -1576,7 +1576,7 @@ function taxonomy_field_settings_form($field, $instance, $has_data) {
 }
 
 /**
- * Implements hook_rdf_mapping().
+ * @implements hook_rdf_mapping().
  *
  * @return array
  *   The rdf mapping for vocabularies and terms.
@@ -1639,7 +1639,7 @@ function taxonomy_rdf_mapping() {
  */
 
 /**
- * Implements hook_field_presave().
+ * @implements hook_field_presave().
  *
  * Create any new terms defined in a freetagging vocabulary.
  */
@@ -1655,7 +1655,7 @@ function taxonomy_field_presave($entity_type, $entity, $field, $instance, $langc
 }
 
 /**
- * Implements hook_field_insert().
+ * @implements hook_field_insert().
  */
 function taxonomy_field_insert($entity_type, $entity, $field, $instance, $langcode, &$items) {
   // We maintain a denormalized table of term/node relationships, containing
@@ -1675,7 +1675,7 @@ function taxonomy_field_insert($entity_type, $entity, $field, $instance, $langco
 }
 
 /**
- * Implements hook_field_update().
+ * @implements hook_field_update().
  */
 function taxonomy_field_update($entity_type, $entity, $field, $instance, $langcode, &$items) {
   if (variable_get('taxonomy_maintain_index_table', TRUE) && $field['storage']['type'] == 'field_sql_storage' && $entity_type == 'node') {
@@ -1705,7 +1705,7 @@ function taxonomy_field_update($entity_type, $entity, $field, $instance, $langco
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function taxonomy_node_delete($node) {
   if (variable_get('taxonomy_maintain_index_table', TRUE)) {
@@ -1715,7 +1715,7 @@ function taxonomy_node_delete($node) {
 }
 
 /**
- * Implements hook_taxonomy_term_delete().
+ * @implements hook_taxonomy_term_delete().
  */
 function taxonomy_taxonomy_term_delete($term) {
   if (variable_get('taxonomy_maintain_index_table', TRUE)) {
diff --git a/modules/taxonomy/taxonomy.tokens.inc b/modules/taxonomy/taxonomy.tokens.inc
index f8ae457..9198262 100644
--- a/modules/taxonomy/taxonomy.tokens.inc
+++ b/modules/taxonomy/taxonomy.tokens.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_token_info().
+ * @implements hook_token_info().
  */
 function taxonomy_token_info() {
   $types['term'] = array(
@@ -86,7 +86,7 @@ function taxonomy_token_info() {
 }
 
 /**
- * Implements hook_tokens().
+ * @implements hook_tokens().
  */
 function taxonomy_tokens($type, $tokens, array $data = array(), array $options = array()) {
   $replacements = array();
diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module
index 61ae648..70a5fbf 100644
--- a/modules/toolbar/toolbar.module
+++ b/modules/toolbar/toolbar.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function toolbar_help($path, $arg) {
   switch ($path) {
@@ -23,7 +23,7 @@ function toolbar_help($path, $arg) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function toolbar_permission() {
   return array(
@@ -34,7 +34,7 @@ function toolbar_permission() {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function toolbar_theme($existing, $type, $theme, $path) {
   $items['toolbar'] = array(
@@ -52,7 +52,7 @@ function toolbar_theme($existing, $type, $theme, $path) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function toolbar_menu() {
   $items['toolbar/toggle'] = array(
@@ -111,7 +111,7 @@ function _toolbar_is_collapsed() {
 }
 
 /**
- * Implements hook_page_build().
+ * @implements hook_page_build().
  *
  * Add admin toolbar to the page_top region automatically.
  */
@@ -135,7 +135,7 @@ function toolbar_pre_render($toolbar) {
 }
 
 /**
- * Implements hook_preprocess_html().
+ * @implements hook_preprocess_html().
  *
  * Add some page classes, so global page theming can adjust to the toolbar.
  */
@@ -149,7 +149,7 @@ function toolbar_preprocess_html(&$vars) {
 }
 
 /**
- * Implements hook_preprocess_toolbar().
+ * @implements hook_preprocess_toolbar().
  *
  * Adding the 'overlay-displace-top' class to the toolbar pushes the overlay
  * down, so it appears below the toolbar.
@@ -159,7 +159,7 @@ function toolbar_preprocess_toolbar(&$variables) {
 }
 
 /**
- * Implements hook_system_info_alter().
+ * @implements hook_system_info_alter().
  *
  * Indicate that the 'page_top' region (in which the toolbar will be displayed)
  * is an overlay supplemental region that should be refreshed whenever its
diff --git a/modules/tracker/tracker.install b/modules/tracker/tracker.install
index cfe8dc7..92b260a 100644
--- a/modules/tracker/tracker.install
+++ b/modules/tracker/tracker.install
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function tracker_uninstall() {
   variable_del('tracker_index_nid');
@@ -9,7 +9,7 @@ function tracker_uninstall() {
 }
 
 /**
- * Implements hook_enable().
+ * @implements hook_enable().
  */
 function tracker_enable() {
   $max_nid = db_query('SELECT MAX(nid) FROM {node}')->fetchField();
@@ -22,7 +22,7 @@ function tracker_enable() {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function tracker_schema() {
   $schema['tracker_node'] = array(
diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module
index 227cf72..ce94345 100644
--- a/modules/tracker/tracker.module
+++ b/modules/tracker/tracker.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function tracker_help($path, $arg) {
   switch ($path) {
@@ -27,7 +27,7 @@ function tracker_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function tracker_menu() {
   $items['tracker'] = array(
@@ -69,7 +69,7 @@ function tracker_menu() {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  */
 function tracker_cron() {
   $max_nid = variable_get('tracker_index_nid', 0);
@@ -163,21 +163,21 @@ function _tracker_user_access($account) {
 }
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function tracker_node_insert($node, $arg = 0) {
   _tracker_add($node->nid, $node->uid, $node->changed);
 }
 
 /**
- * Implements hook_node_update().
+ * @implements hook_node_update().
  */
 function tracker_node_update($node, $arg = 0) {
   _tracker_add($node->nid, $node->uid, $node->changed);
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function tracker_node_delete($node, $arg = 0) {
   db_delete('tracker_node')
@@ -189,7 +189,7 @@ function tracker_node_delete($node, $arg = 0) {
 }
 
 /**
- * Implements hook_comment_update().
+ * @implements hook_comment_update().
  *
  * Comment module doesn't call hook_comment_unpublish() when saving individual
  * comments so we need to check for those here.
@@ -203,7 +203,7 @@ function tracker_comment_update($comment) {
 }
 
 /**
- * Implements hook_comment_publish().
+ * @implements hook_comment_publish().
  *
  * This actually handles the insert and update of published nodes since
  * comment_save() calls hook_comment_publish() for all published comments.
@@ -213,14 +213,14 @@ function tracker_comment_publish($comment) {
 }
 
 /**
- * Implements hook_comment_unpublish().
+ * @implements hook_comment_unpublish().
  */
 function tracker_comment_unpublish($comment) {
   _tracker_remove($comment->nid, $comment->uid, $comment->changed);
 }
 
 /**
- * Implements hook_comment_delete().
+ * @implements hook_comment_delete().
  */
 function tracker_comment_delete($comment) {
   _tracker_remove($comment->nid, $comment->uid, $comment->changed);
diff --git a/modules/translation/tests/translation_test.module b/modules/translation/tests/translation_test.module
index e3bb4b5..dd90da1 100644
--- a/modules/translation/tests/translation_test.module
+++ b/modules/translation/tests/translation_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function translation_test_node_insert($node) {
   drupal_write_record('node', $node, 'nid');
diff --git a/modules/translation/translation.module b/modules/translation/translation.module
index e0ee18f..2c8f53f 100644
--- a/modules/translation/translation.module
+++ b/modules/translation/translation.module
@@ -25,7 +25,7 @@
 define('TRANSLATION_ENABLED', 2);
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function translation_help($path, $arg) {
   switch ($path) {
@@ -52,7 +52,7 @@ function translation_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function translation_menu() {
   $items = array();
@@ -84,7 +84,7 @@ function _translation_tab_access($node) {
 }
 
 /**
- * Implements hook_admin_paths().
+ * @implements hook_admin_paths().
  */
 function translation_admin_paths() {
   if (variable_get('node_admin_theme')) {
@@ -96,7 +96,7 @@ function translation_admin_paths() {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function translation_permission() {
   return array(
@@ -107,7 +107,7 @@ function translation_permission() {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  */
 function translation_form_node_type_form_alter(&$form, &$form_state) {
   // Add translation option to content type form.
@@ -117,7 +117,7 @@ function translation_form_node_type_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_form_BASE_FORM_ID_alter().
+ * @implements hook_form_BASE_FORM_ID_alter().
  *
  * This function alters language fields on node edit forms when a translation is
  * about to be created.
@@ -198,7 +198,7 @@ function translation_form_node_form_alter(&$form, &$form_state) {
 }
 
 /**
- * Implements hook_node_view().
+ * @implements hook_node_view().
  *
  * Display translation links with native language names, if this node is part of
  * a translation set. If no language provider is enabled "fall back" to the
@@ -259,7 +259,7 @@ function translation_node_view($node, $view_mode) {
 }
 
 /**
- * Implements hook_node_prepare().
+ * @implements hook_node_prepare().
  */
 function translation_node_prepare($node) {
   // Only act if we are dealing with a content type supporting translations.
@@ -309,7 +309,7 @@ function translation_node_prepare($node) {
 }
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function translation_node_insert($node) {
   // Only act if we are dealing with a content type supporting translations.
@@ -344,7 +344,7 @@ function translation_node_insert($node) {
 }
 
 /**
- * Implements hook_node_update().
+ * @implements hook_node_update().
  */
 function translation_node_update($node) {
   // Only act if we are dealing with a content type supporting translations.
@@ -371,7 +371,7 @@ function translation_node_update($node) {
 }
 
 /**
- * Implements hook_node_validate().
+ * @implements hook_node_validate().
  *
  * Ensure that duplicate translations can not be created for the same source.
  */
@@ -387,7 +387,7 @@ function translation_node_validate($node, $form) {
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function translation_node_delete($node) {
   // Only act if we are dealing with a content type supporting translations.
@@ -496,7 +496,7 @@ function translation_path_get_translations($path) {
 }
 
 /**
- * Implements hook_language_switch_links_alter().
+ * @implements hook_language_switch_links_alter().
  *
  * Replaces links with pointers to translated versions of the content.
  */
diff --git a/modules/trigger/tests/trigger_test.module b/modules/trigger/tests/trigger_test.module
index 0e3f3f8..38e3eda 100644
--- a/modules/trigger/tests/trigger_test.module
+++ b/modules/trigger/tests/trigger_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_action_info().
+ * @implements hook_action_info().
  */
 function trigger_test_action_info() {
   // Register an action that can be assigned to the trigger "cron".
@@ -52,7 +52,7 @@ function trigger_test_action_info() {
 }
 
 /**
- * Implements hook_trigger_info().
+ * @implements hook_trigger_info().
  */
 function trigger_test_trigger_info() {
   // Register triggers that this module provides. The first is an additional
diff --git a/modules/trigger/trigger.install b/modules/trigger/trigger.install
index 7dded60..e016f2e 100644
--- a/modules/trigger/trigger.install
+++ b/modules/trigger/trigger.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function trigger_schema() {
   $schema['trigger_assignments'] = array(
@@ -45,7 +45,7 @@ function trigger_schema() {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function trigger_install() {
   // Do initial synchronization of actions in code and the database.
diff --git a/modules/trigger/trigger.module b/modules/trigger/trigger.module
index 6c1f58f..e7da81e 100644
--- a/modules/trigger/trigger.module
+++ b/modules/trigger/trigger.module
@@ -7,7 +7,7 @@
  */
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function trigger_help($path, $arg) {
   // Generate help text for admin/structure/trigger/(module) tabs.
@@ -38,7 +38,7 @@ function trigger_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function trigger_menu() {
   $items['admin/structure/trigger'] = array(
@@ -74,7 +74,7 @@ function trigger_menu() {
 }
 
 /**
- * Implements hook_trigger_info().
+ * @implements hook_trigger_info().
  *
  * Defines all the triggers that this module implements triggers for.
  */
@@ -170,7 +170,7 @@ function trigger_get_assigned_actions($hook) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function trigger_theme() {
   return array(
@@ -182,7 +182,7 @@ function trigger_theme() {
 }
 
 /**
- * Implements hook_forms().
+ * @implements hook_forms().
  *
  * We re-use code by using the same assignment form definition for each hook.
  */
@@ -281,35 +281,35 @@ function _trigger_node($node, $hook, $a3 = NULL, $a4 = NULL) {
 }
 
 /**
- * Implements hook_node_view().
+ * @implements hook_node_view().
  */
 function trigger_node_view($node, $view_mode) {
   _trigger_node($node, 'node_view', $view_mode);
 }
 
 /**
- * Implements hook_node_update().
+ * @implements hook_node_update().
  */
 function trigger_node_update($node) {
   _trigger_node($node, 'node_update');
 }
 
 /**
- * Implements hook_node_presave().
+ * @implements hook_node_presave().
  */
 function trigger_node_presave($node) {
   _trigger_node($node, 'node_presave');
 }
 
 /**
- * Implements hook_node_insert().
+ * @implements hook_node_insert().
  */
 function trigger_node_insert($node) {
   _trigger_node($node, 'node_insert');
 }
 
 /**
- * Implements hook_node_delete().
+ * @implements hook_node_delete().
  */
 function trigger_node_delete($node) {
   _trigger_node($node, 'node_delete');
@@ -345,35 +345,35 @@ function _trigger_normalize_comment_context($type, $comment) {
 }
 
 /**
- * Implements hook_comment_presave().
+ * @implements hook_comment_presave().
  */
 function trigger_comment_presave($comment) {
   _trigger_comment($comment, 'comment_presave');
 }
 
 /**
- * Implements hook_comment_insert().
+ * @implements hook_comment_insert().
  */
 function trigger_comment_insert($comment) {
   _trigger_comment($comment, 'comment_insert');
 }
 
 /**
- * Implements hook_comment_update().
+ * @implements hook_comment_update().
  */
 function trigger_comment_update($comment) {
   _trigger_comment($comment, 'comment_update');
 }
 
 /**
- * Implements hook_comment_delete().
+ * @implements hook_comment_delete().
  */
 function trigger_comment_delete($comment) {
   _trigger_comment($comment, 'comment_delete');
 }
 
 /**
- * Implements hook_comment_view().
+ * @implements hook_comment_view().
  */
 function trigger_comment_view($comment) {
   _trigger_comment($comment, 'comment_view');
@@ -416,7 +416,7 @@ function _trigger_comment($a1, $hook) {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  */
 function trigger_cron() {
   $aids = trigger_get_assigned_actions('cron');
@@ -461,14 +461,14 @@ function _trigger_normalize_user_context($type, $account) {
 }
 
 /**
- * Implements hook_user_login().
+ * @implements hook_user_login().
  */
 function trigger_user_login(&$edit, $account, $category) {
   _trigger_user('user_login', $edit, $account, $category);
 }
 
 /**
- * Implements hook_user_logout().
+ * @implements hook_user_logout().
  */
 function trigger_user_logout($account) {
   $edit = array();
@@ -476,21 +476,21 @@ function trigger_user_logout($account) {
 }
 
 /**
- * Implements hook_user_insert().
+ * @implements hook_user_insert().
  */
 function trigger_user_insert(&$edit, $account, $category) {
   _trigger_user('user_insert', $edit, $account, $category);
 }
 
 /**
- * Implements hook_user_update().
+ * @implements hook_user_update().
  */
 function trigger_user_update(&$edit, $account, $category) {
   _trigger_user('user_update', $edit, $account, $category);
 }
 
 /**
- * Implements hook_user_cancel().
+ * @implements hook_user_cancel().
  */
 function trigger_user_cancel($edit, $account, $method) {
   switch ($method) {
@@ -501,7 +501,7 @@ function trigger_user_cancel($edit, $account, $method) {
 }
 
 /**
- * Implements hook_user_delete().
+ * @implements hook_user_delete().
  */
 function trigger_user_delete($account) {
   $edit = array();
@@ -509,7 +509,7 @@ function trigger_user_delete($account) {
 }
 
 /**
- * Implements hook_user_view().
+ * @implements hook_user_view().
  */
 function trigger_user_view($account) {
   $edit = NULL;
@@ -563,28 +563,28 @@ function _trigger_taxonomy($hook, $array) {
 }
 
 /**
- * Implements hook_taxonomy_term_insert().
+ * @implements hook_taxonomy_term_insert().
  */
 function trigger_taxonomy_term_insert($term) {
   _trigger_taxonomy('taxonomy_term_insert', (array) $term);
 }
 
 /**
- * Implements hook_taxonomy_term_update().
+ * @implements hook_taxonomy_term_update().
  */
 function trigger_taxonomy_term_update($term) {
   _trigger_taxonomy('taxonomy_term_update', (array) $term);
 }
 
 /**
- * Implements hook_taxonomy_term_delete().
+ * @implements hook_taxonomy_term_delete().
  */
 function trigger_taxonomy_term_delete($term) {
   _trigger_taxonomy('taxonomy_term_delete', (array) $term);
 }
 
 /**
- * Implements hook_actions_delete().
+ * @implements hook_actions_delete().
  *
  * Removes all trigger entries for the given action, when an action is deleted.
  */
diff --git a/modules/update/tests/update_test.module b/modules/update/tests/update_test.module
index 4e32d33..6d42cb5 100644
--- a/modules/update/tests/update_test.module
+++ b/modules/update/tests/update_test.module
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function update_test_menu() {
   $items = array();
@@ -17,7 +17,7 @@ function update_test_menu() {
 }
 
 /**
- * Implements hook_system_info_alter().
+ * @implements hook_system_info_alter().
  *
  * This checks the 'update_test_system_info' variable and sees if we need to
  * alter the system info for the given $file based on the setting. The setting
@@ -39,7 +39,7 @@ function update_test_system_info_alter(&$info, $file) {
 }
 
 /**
- * Implements hook_update_status_alter().
+ * @implements hook_update_status_alter().
  *
  * This checks the 'update_test_update_status' variable and sees if we need to
  * alter the update status for the given project based on the setting. The
@@ -113,7 +113,7 @@ function update_test_archiver_info() {
 }
 
 /**
- * Implements hook_filetransfer_info().
+ * @implements hook_filetransfer_info().
  */
 function update_test_filetransfer_info() {
   // Define a mock file transfer method, to ensure that there will always be
diff --git a/modules/update/update.install b/modules/update/update.install
index f0d5499..4ac1028 100644
--- a/modules/update/update.install
+++ b/modules/update/update.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_requirements().
+ * @implements hook_requirements().
  *
  * @return
  *   An array describing the status of the site regarding available updates.
@@ -58,7 +58,7 @@ function update_requirements($phase) {
 }
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function update_schema() {
   $schema['cache_update'] = drupal_get_schema_unprocessed('system', 'cache');
@@ -67,7 +67,7 @@ function update_schema() {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function update_install() {
   $queue = DrupalQueue::get('update_fetch_tasks', TRUE);
@@ -75,7 +75,7 @@ function update_install() {
 }
 
 /**
- * Implements hook_uninstall().
+ * @implements hook_uninstall().
  */
 function update_uninstall() {
   // Clear any variables that might be in use
diff --git a/modules/update/update.module b/modules/update/update.module
index 1008964..540cbc5 100644
--- a/modules/update/update.module
+++ b/modules/update/update.module
@@ -71,7 +71,7 @@ define('UPDATE_MAX_FETCH_ATTEMPTS', 2);
 define('UPDATE_MAX_FETCH_TIME', 5);
 
 /**
- * Implements hook_help().
+ * @implements hook_help().
  */
 function update_help($path, $arg) {
   switch ($path) {
@@ -103,7 +103,7 @@ function update_help($path, $arg) {
 }
 
 /**
- * Implements hook_init().
+ * @implements hook_init().
  */
 function update_init() {
   if (arg(0) == 'admin' && user_access('administer site configuration')) {
@@ -157,7 +157,7 @@ function update_init() {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function update_menu() {
   $items = array();
@@ -259,7 +259,7 @@ function update_manager_access() {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function update_theme() {
   return array(
@@ -283,7 +283,7 @@ function update_theme() {
 }
 
 /**
- * Implements hook_cron().
+ * @implements hook_cron().
  */
 function update_cron() {
   $frequency = variable_get('update_check_frequency', 1);
@@ -306,7 +306,7 @@ function update_cron() {
 }
 
 /**
- * Implements hook_themes_enabled().
+ * @implements hook_themes_enabled().
  *
  * If themes are enabled, we invalidate the cache of available updates.
  */
@@ -316,7 +316,7 @@ function update_themes_enabled($themes) {
 }
 
 /**
- * Implements hook_themes_disabled().
+ * @implements hook_themes_disabled().
  *
  * If themes are disabled, we invalidate the cache of available updates.
  */
@@ -326,7 +326,7 @@ function update_themes_disabled($themes) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  *
  * Adds a submit handler to the system modules form, so that if a site admin
  * saves the form, we invalidate the cache of available updates.
@@ -478,7 +478,7 @@ function _update_get_cached_available_releases() {
 }
 
 /**
- * Implements hook_mail().
+ * @implements hook_mail().
  *
  * Constructs the email notification message when the site is out of date.
  *
@@ -643,7 +643,7 @@ function theme_update_last_check($variables) {
 }
 
 /**
- * Implements hook_verify_update_archive().
+ * @implements hook_verify_update_archive().
  *
  * First, we ensure that the archive isn't a copy of Drupal core, which the
  * Update manager does not yet support. @see http://drupal.org/node/606592
@@ -830,7 +830,7 @@ function _update_cache_clear($cid = NULL, $wildcard = FALSE) {
 }
 
 /**
- * Implements hook_flush_caches().
+ * @implements hook_flush_caches().
  *
  * Called from update.php (among others) to flush the caches.
  * Since we're running update.php, we are likely to install a new version of
diff --git a/modules/user/tests/user_form_test.module b/modules/user/tests/user_form_test.module
index 4e907f3..15a8450 100644
--- a/modules/user/tests/user_form_test.module
+++ b/modules/user/tests/user_form_test.module
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  *
  * Sets up a form that allows a user to validate password.
  */
diff --git a/modules/user/user.install b/modules/user/user.install
index 370427f..816abb9 100644
--- a/modules/user/user.install
+++ b/modules/user/user.install
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_schema().
+ * @implements hook_schema().
  */
 function user_schema() {
   $schema['authmap'] = array(
@@ -285,7 +285,7 @@ function user_schema() {
 }
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  */
 function user_install() {
   // Insert a row for the anonymous user.
diff --git a/modules/user/user.module b/modules/user/user.module
index 92a55bc..ea60e7d 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -87,7 +87,7 @@ function user_module_invoke($type, &$edit, $account, $category = NULL) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function user_theme() {
   return array(
@@ -132,7 +132,7 @@ function user_theme() {
 }
 
 /**
- * Implements hook_entity_info().
+ * @implements hook_entity_info().
  */
 function user_entity_info() {
   $return = array(
@@ -176,7 +176,7 @@ function user_uri($user) {
 }
 
 /**
- * Implements hook_field_info_alter().
+ * @implements hook_field_info_alter().
  */
 function user_field_info_alter(&$info) {
   // Add the 'user_register_form' instance setting to all field types.
@@ -189,7 +189,7 @@ function user_field_info_alter(&$info) {
 }
 
 /**
- * Implements hook_field_extra_fields().
+ * @implements hook_field_extra_fields().
  */
 function user_field_extra_fields() {
   $return['user']['user'] = array(
@@ -821,7 +821,7 @@ function user_is_blocked($name) {
 }
 
 /**
- * Implements hook_permission().
+ * @implements hook_permission().
  */
 function user_permission() {
   return array(
@@ -851,7 +851,7 @@ function user_permission() {
 }
 
 /**
- * Implements hook_file_download().
+ * @implements hook_file_download().
  *
  * Ensure that user pictures (avatars) are always downloadable.
  */
@@ -863,7 +863,7 @@ function user_file_download($uri) {
 }
 
 /**
- * Implements hook_file_move().
+ * @implements hook_file_move().
  */
 function user_file_move($file, $source) {
   // If a user's picture is replaced with a new one, update the record in
@@ -879,7 +879,7 @@ function user_file_move($file, $source) {
 }
 
 /**
- * Implements hook_file_delete().
+ * @implements hook_file_delete().
  */
 function user_file_delete($file) {
   // Remove any references to the file.
@@ -890,7 +890,7 @@ function user_file_delete($file) {
 }
 
 /**
- * Implements hook_search_info().
+ * @implements hook_search_info().
  */
 function user_search_info() {
   return array(
@@ -899,14 +899,14 @@ function user_search_info() {
 }
 
 /**
- * Implements hook_search_access().
+ * @implements hook_search_access().
  */
 function user_search_access() {
   return user_access('access user profiles');
 }
 
 /**
- * Implements hook_search_execute().
+ * @implements hook_search_execute().
  */
 function user_search_execute($keys = NULL, $conditions = NULL) {
   $find = array();
@@ -946,7 +946,7 @@ function user_search_execute($keys = NULL, $conditions = NULL) {
 }
 
 /**
- * Implements hook_element_info().
+ * @implements hook_element_info().
  */
 function user_element_info() {
   $types['user_profile_category'] = array(
@@ -959,7 +959,7 @@ function user_element_info() {
 }
 
 /**
- * Implements hook_user_view().
+ * @implements hook_user_view().
  */
 function user_user_view($account) {
   $account->content['user_picture'] = array(
@@ -1238,7 +1238,7 @@ function user_account_form_validate($form, &$form_state) {
 }
 
 /**
- * Implements hook_user_presave().
+ * @implements hook_user_presave().
  */
 function user_user_presave(&$edit, $account, $category) {
   if ($category == 'account' || $category == 'register') {
@@ -1264,7 +1264,7 @@ function user_user_presave(&$edit, $account, $category) {
 }
 
 /**
- * Implements hook_user_categories().
+ * @implements hook_user_categories().
  */
 function user_user_categories() {
   return array(array(
@@ -1305,7 +1305,7 @@ function user_login_block($form) {
 }
 
 /**
- * Implements hook_block_info().
+ * @implements hook_block_info().
  */
 function user_block_info() {
   global $user;
@@ -1326,7 +1326,7 @@ function user_block_info() {
 }
 
 /**
- * Implements hook_block_configure().
+ * @implements hook_block_configure().
  */
 function user_block_configure($delta = '') {
   global $user;
@@ -1350,7 +1350,7 @@ function user_block_configure($delta = '') {
 }
 
 /**
- * Implements hook_block_save().
+ * @implements hook_block_save().
  */
 function user_block_save($delta = '', $edit = array()) {
   global $user;
@@ -1368,7 +1368,7 @@ function user_block_save($delta = '', $edit = array()) {
 }
 
 /**
- * Implements hook_block_view().
+ * @implements hook_block_view().
  */
 function user_block_view($delta = '') {
   global $user;
@@ -1551,7 +1551,7 @@ function user_cancel_access($account) {
 }
 
 /**
- * Implements hook_menu().
+ * @implements hook_menu().
  */
 function user_menu() {
   $items['user/autocomplete'] = array(
@@ -1788,7 +1788,7 @@ function user_menu() {
 }
 
 /**
- * Implements hook_menu_site_status_alter().
+ * @implements hook_menu_site_status_alter().
  */
 function user_menu_site_status_alter(&$menu_site_status, $path) {
   if ($menu_site_status == MENU_SITE_OFFLINE) {
@@ -1830,7 +1830,7 @@ function user_menu_site_status_alter(&$menu_site_status, $path) {
 }
 
 /**
- * Implements hook_menu_link_alter().
+ * @implements hook_menu_link_alter().
  */
 function user_menu_link_alter(&$link) {
   // The path 'user' must be accessible for anonymous users, but only visible
@@ -1849,7 +1849,7 @@ function user_menu_link_alter(&$link) {
 }
 
 /**
- * Implements hook_translated_menu_link_alter().
+ * @implements hook_translated_menu_link_alter().
  */
 function user_translated_menu_link_alter(&$link) {
   // Hide the "User account" link for anonymous users.
@@ -1859,7 +1859,7 @@ function user_translated_menu_link_alter(&$link) {
 }
 
 /**
- * Implements hook_admin_paths().
+ * @implements hook_admin_paths().
  */
 function user_admin_paths() {
   $paths = array(
@@ -2533,7 +2533,7 @@ function user_build_content($account, $view_mode = 'full', $langcode = NULL) {
 }
 
 /**
- * Implements hook_mail().
+ * @implements hook_mail().
  */
 function user_mail($key, &$message, $params) {
   $language = $message['language'];
@@ -3002,7 +3002,7 @@ function user_role_revoke_permissions($rid, array $permissions = array()) {
 }
 
 /**
- * Implements hook_user_operations().
+ * @implements hook_user_operations().
  */
 function user_user_operations($form = array(), $form_state = array()) {
   $operations = array(
@@ -3331,7 +3331,7 @@ function user_build_filter_query(SelectQuery $query) {
 }
 
 /**
- * Implements hook_forms().
+ * @implements hook_forms().
  */
 function user_forms() {
   $forms['user_admin_access_add_form']['callback'] = 'user_admin_access_form';
@@ -3340,7 +3340,7 @@ function user_forms() {
 }
 
 /**
- * Implements hook_comment_view().
+ * @implements hook_comment_view().
  */
 function user_comment_view($comment) {
   if (variable_get('user_signatures', 0) && !empty($comment->signature)) {
@@ -3489,7 +3489,7 @@ function user_form_process_password_confirm($element) {
 }
 
 /**
- * Implements hook_node_load().
+ * @implements hook_node_load().
  */
 function user_node_load($nodes, $types) {
   // Build an array of all uids for node authors, keyed by nid.
@@ -3510,7 +3510,7 @@ function user_node_load($nodes, $types) {
 }
 
 /**
- * Implements hook_image_style_delete().
+ * @implements hook_image_style_delete().
  */
 function user_image_style_delete($style) {
   // If a style is deleted, update the variables.
@@ -3519,7 +3519,7 @@ function user_image_style_delete($style) {
 }
 
 /**
- * Implements hook_image_style_save().
+ * @implements hook_image_style_save().
  */
 function user_image_style_save($style) {
   // If a style is renamed, update the variables that use it.
@@ -3529,7 +3529,7 @@ function user_image_style_save($style) {
 }
 
 /**
- * Implements hook_action_info().
+ * @implements hook_action_info().
  */
 function user_action_info() {
   return array(
@@ -3566,7 +3566,7 @@ function user_block_user_action(&$entity, $context = array()) {
 }
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  *
  * Add a checkbox for the 'user_register_form' instance settings on the 'Edit
  * field instance' form.
@@ -3758,7 +3758,7 @@ function user_register_submit($form, &$form_state) {
 }
 
 /**
- * Implements hook_modules_installed().
+ * @implements hook_modules_installed().
  */
 function user_modules_installed($modules) {
   // Assign all available permissions to the administrator role.
@@ -3777,7 +3777,7 @@ function user_modules_installed($modules) {
 }
 
 /**
- * Implements hook_modules_uninstalled().
+ * @implements hook_modules_uninstalled().
  */
 function user_modules_uninstalled($modules) {
    db_delete('role_permission')
@@ -3823,7 +3823,7 @@ function user_cookie_delete($cookie_name) {
 }
 
 /**
- * Implements hook_rdf_mapping().
+ * @implements hook_rdf_mapping().
  */
 function user_rdf_mapping() {
   return array(
@@ -3845,7 +3845,7 @@ function user_rdf_mapping() {
 }
 
 /**
- * Implements hook_file_download_access().
+ * @implements hook_file_download_access().
  */
 function user_file_download_access($field, $entity_type, $entity) {
   if ($entity_type == 'user') {
@@ -3854,7 +3854,7 @@ function user_file_download_access($field, $entity_type, $entity) {
 }
 
 /**
- * Implements hook_system_info_alter().
+ * @implements hook_system_info_alter().
  *
  * Drupal 7 ships with two methods to add additional fields to users: Profile
  * module, a legacy module dating back from 2002, and Field API integration
diff --git a/modules/user/user.tokens.inc b/modules/user/user.tokens.inc
index 8dcea4b..35b2658 100644
--- a/modules/user/user.tokens.inc
+++ b/modules/user/user.tokens.inc
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_token_info().
+ * @implements hook_token_info().
  */
 function user_token_info() {
   $types['user'] = array(
@@ -59,7 +59,7 @@ function user_token_info() {
 }
 
 /**
- * Implements hook_tokens().
+ * @implements hook_tokens().
  */
 function user_tokens($type, $tokens, array $data = array(), array $options = array()) {
   $url_options = array('absolute' => TRUE);
diff --git a/profiles/minimal/minimal.install b/profiles/minimal/minimal.install
index 059f038..20329e2 100644
--- a/profiles/minimal/minimal.install
+++ b/profiles/minimal/minimal.install
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  *
  * Perform actions to set up the site for this profile.
  */
diff --git a/profiles/minimal/minimal.profile b/profiles/minimal/minimal.profile
index ff8f281..e3f7344 100644
--- a/profiles/minimal/minimal.profile
+++ b/profiles/minimal/minimal.profile
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  *
  * Allows the profile to alter the site configuration form.
  */
diff --git a/profiles/standard/standard.install b/profiles/standard/standard.install
index 7082906..b866357 100644
--- a/profiles/standard/standard.install
+++ b/profiles/standard/standard.install
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  *
  * Perform actions to set up the site for this profile.
  */
diff --git a/profiles/standard/standard.profile b/profiles/standard/standard.profile
index 7671c12..d03fb88 100644
--- a/profiles/standard/standard.profile
+++ b/profiles/standard/standard.profile
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_form_FORM_ID_alter().
+ * @implements hook_form_FORM_ID_alter().
  *
  * Allows the profile to alter the site configuration form.
  */
diff --git a/profiles/testing/testing.install b/profiles/testing/testing.install
index 192704d..4e67617 100644
--- a/profiles/testing/testing.install
+++ b/profiles/testing/testing.install
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Implements hook_install().
+ * @implements hook_install().
  *
  * Perform actions to set up the site for this profile.
  */
diff --git a/themes/engines/phptemplate/phptemplate.engine b/themes/engines/phptemplate/phptemplate.engine
index d293b85..c303c62 100644
--- a/themes/engines/phptemplate/phptemplate.engine
+++ b/themes/engines/phptemplate/phptemplate.engine
@@ -6,7 +6,7 @@
  */
 
 /**
- * Implements hook_init().
+ * @implements hook_init().
  */
 function phptemplate_init($template) {
   $file = dirname($template->filename) . '/template.php';
@@ -16,7 +16,7 @@ function phptemplate_init($template) {
 }
 
 /**
- * Implements hook_theme().
+ * @implements hook_theme().
  */
 function phptemplate_theme($existing, $type, $theme, $path) {
   $templates = drupal_find_theme_functions($existing, array($theme));