From f25a6839fd6e6b227ab76605c21b7bbe1bbee598 Mon Sep 17 00:00:00 2001
From: Sam Hemelryk <sam@moodle.com>
Date: Thu, 13 Feb 2014 10:55:46 +1300
Subject: [PATCH] MDL-44120 block: tidied up block @package uses

---
 .../block_activity_modules.php                | 22 ++++++++++
 .../lang/en/block_activity_modules.php        |  1 -
 blocks/activity_modules/version.php           |  3 +-
 .../admin_bookmarks/block_admin_bookmarks.php |  4 +-
 blocks/admin_bookmarks/create.php             | 22 ++++++++++
 blocks/admin_bookmarks/delete.php             | 22 ++++++++++
 .../lang/en/block_admin_bookmarks.php         |  1 -
 blocks/admin_bookmarks/version.php            |  3 +-
 blocks/badges/db/access.php                   |  3 +-
 blocks/blog_menu/block_blog_menu.php          |  3 +-
 blocks/blog_menu/version.php                  |  3 +-
 blocks/blog_recent/block_blog_recent.php      |  7 ++-
 blocks/blog_recent/edit_form.php              |  3 +-
 blocks/blog_recent/version.php                |  3 +-
 blocks/blog_tags/block_blog_tags.php          |  3 +-
 blocks/blog_tags/edit_form.php                |  3 +-
 blocks/blog_tags/lang/en/block_blog_tags.php  |  1 -
 blocks/blog_tags/version.php                  |  3 +-
 .../lang/en/block_calendar_month.php          |  1 -
 blocks/calendar_month/version.php             |  3 +-
 .../lang/en/block_calendar_upcoming.php       |  1 -
 blocks/calendar_upcoming/version.php          |  3 +-
 blocks/comments/block_comments.php            |  3 +-
 blocks/comments/lib.php                       |  3 +-
 blocks/comments/version.php                   |  3 +-
 blocks/community/block_community.php          |  6 +--
 blocks/community/communitycourse.php          | 13 +++---
 blocks/community/db/upgrade.php               |  3 +-
 blocks/community/forms.php                    | 10 ++---
 blocks/community/lang/en/block_community.php  |  1 -
 blocks/community/locallib.php                 | 11 ++---
 blocks/community/renderer.php                 |  3 +-
 blocks/community/version.php                  |  3 +-
 .../block_completionstatus.php                |  3 +-
 blocks/completionstatus/db/upgrade.php        |  2 +-
 blocks/completionstatus/details.php           |  3 +-
 blocks/completionstatus/version.php           |  3 +-
 blocks/course_list/block_course_list.php      | 22 ++++++++++
 .../course_list/lang/en/block_course_list.php |  1 -
 blocks/course_list/settings.php               | 22 ++++++++++
 blocks/course_list/version.php                |  3 +-
 .../course_summary/block_course_summary.php   | 22 ++++++++++
 blocks/course_summary/db/upgrade.php          |  3 +-
 blocks/course_summary/version.php             |  3 +-
 blocks/edit_form.php                          |  4 +-
 blocks/feedback/block_feedback.php            | 23 ++++++++++
 blocks/feedback/db/install.php                | 22 ++++++++++
 blocks/feedback/lang/en/block_feedback.php    |  1 -
 blocks/feedback/version.php                   |  3 +-
 ...store_glossary_random_block_task.class.php |  3 +-
 .../glossary_random/block_glossary_random.php | 22 ++++++++++
 blocks/glossary_random/edit_form.php          |  3 +-
 .../lang/en/block_glossary_random.php         |  1 -
 blocks/glossary_random/version.php            |  3 +-
 blocks/html/backup/moodle1/lib.php            | 14 ++++++
 .../moodle2/backup_html_block_task.class.php  |  7 ++-
 .../moodle2/restore_html_block_task.class.php |  3 +-
 blocks/html/block_html.php                    |  1 -
 blocks/html/db/upgrade.php                    |  8 ++--
 blocks/html/edit_form.php                     |  1 -
 blocks/html/lang/en/block_html.php            |  1 -
 blocks/html/lib.php                           |  1 -
 blocks/html/settings.php                      | 22 ++++++++++
 blocks/html/version.php                       |  3 +-
 blocks/login/block_login.php                  | 22 ++++++++++
 blocks/login/lang/en/block_login.php          |  1 -
 blocks/login/version.php                      |  3 +-
 blocks/mentees/block_mentees.php              | 22 ++++++++++
 blocks/mentees/edit_form.php                  |  3 +-
 blocks/mentees/version.php                    |  3 +-
 blocks/messages/block_messages.php            | 22 ++++++++++
 blocks/messages/lang/en/block_messages.php    |  1 -
 blocks/messages/version.php                   |  3 +-
 blocks/mnet_hosts/block_mnet_hosts.php        | 22 ++++++++++
 .../mnet_hosts/lang/en/block_mnet_hosts.php   |  1 -
 blocks/mnet_hosts/version.php                 |  3 +-
 blocks/moodleblock.class.php                  | 10 ++---
 blocks/myprofile/block_myprofile.php          |  3 +-
 blocks/myprofile/edit_form.php                |  3 +-
 blocks/myprofile/lang/en/block_myprofile.php  |  3 +-
 blocks/myprofile/version.php                  |  3 +-
 blocks/navigation/db/upgrade.php              |  9 ++--
 .../navigation/lang/en/block_navigation.php   |  2 +-
 blocks/news_items/block_news_items.php        | 29 +++++++++++++
 .../news_items/lang/en/block_news_items.php   |  1 -
 blocks/news_items/version.php                 |  7 ++-
 blocks/online_users/block_online_users.php    | 22 ++++++++++
 blocks/online_users/settings.php              | 22 ++++++++++
 blocks/online_users/version.php               |  3 +-
 blocks/participants/block_participants.php    | 22 ++++++++++
 .../lang/en/block_participants.php            |  1 -
 blocks/participants/version.php               |  3 +-
 blocks/private_files/block_private_files.php  |  1 -
 blocks/private_files/edit.php                 |  1 -
 .../lang/en/block_private_files.php           |  1 -
 blocks/private_files/renderer.php             |  3 --
 blocks/private_files/version.php              |  3 +-
 .../restore_quiz_results_block_task.class.php |  6 +--
 blocks/quiz_results/block_quiz_results.php    |  6 +--
 blocks/quiz_results/edit_form.php             |  3 +-
 .../lang/en/block_quiz_results.php            |  4 +-
 blocks/quiz_results/version.php               |  3 +-
 blocks/rss_client/backup/moodle1/lib.php      | 14 ++++++
 .../backup_rss_client_block_task.class.php    |  3 +-
 .../moodle2/backup_rss_client_stepslib.php    |  3 +-
 .../restore_rss_client_block_task.class.php   |  3 +-
 .../moodle2/restore_rss_client_stepslib.php   |  3 +-
 blocks/rss_client/block_rss_client.php        |  3 +-
 blocks/rss_client/edit_form.php               |  3 +-
 blocks/rss_client/editfeed.php                |  3 +-
 .../rss_client/lang/en/block_rss_client.php   |  1 -
 blocks/rss_client/managefeeds.php             |  3 +-
 blocks/rss_client/settings.php                | 22 ++++++++++
 blocks/rss_client/version.php                 |  3 +-
 blocks/rss_client/viewfeed.php                |  3 +-
 blocks/search_forums/block_search_forums.php  | 22 ++++++++++
 .../lang/en/block_search_forums.php           |  1 -
 blocks/search_forums/version.php              |  3 +-
 .../selfcompletion/block_selfcompletion.php   | 43 +++++++++----------
 blocks/selfcompletion/db/upgrade.php          |  3 +-
 .../lang/en/block_selfcompletion.php          |  1 -
 blocks/selfcompletion/version.php             |  3 +-
 blocks/settings/block_settings.php            |  5 +--
 blocks/settings/db/upgrade.php                |  3 +-
 blocks/settings/edit_form.php                 |  5 +--
 blocks/settings/lang/en/block_settings.php    |  2 +-
 blocks/settings/renderer.php                  | 22 ++++++++++
 blocks/settings/version.php                   |  3 +-
 .../site_main_menu/block_site_main_menu.php   | 22 ++++++++++
 blocks/site_main_menu/version.php             |  3 +-
 .../block_social_activities.php               | 22 ++++++++++
 .../lang/en/block_social_activities.php       |  1 -
 blocks/social_activities/version.php          |  3 +-
 blocks/tag_flickr/block_tag_flickr.php        | 22 ++++++++++
 blocks/tag_flickr/edit_form.php               |  3 +-
 .../tag_flickr/lang/en/block_tag_flickr.php   |  1 -
 blocks/tag_flickr/version.php                 |  3 +-
 blocks/tag_youtube/block_tag_youtube.php      | 22 ++++++++++
 blocks/tag_youtube/edit_form.php              |  3 +-
 .../tag_youtube/lang/en/block_tag_youtube.php |  1 -
 blocks/tag_youtube/version.php                |  3 +-
 blocks/tags/block_tags.php                    |  7 +++
 blocks/tags/edit_form.php                     |  2 +-
 blocks/tags/settings.php                      |  8 ++++
 blocks/tags/version.php                       |  3 +-
 145 files changed, 742 insertions(+), 260 deletions(-)

diff --git a/blocks/activity_modules/block_activity_modules.php b/blocks/activity_modules/block_activity_modules.php
index 6dc2f9b1055..37736a5eda9 100644
--- a/blocks/activity_modules/block_activity_modules.php
+++ b/blocks/activity_modules/block_activity_modules.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * This file contains the Activity modules block.
+ *
+ * @package    block_activity_modules
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 defined('MOODLE_INTERNAL') || die();
 require_once($CFG->libdir . '/filelib.php');
diff --git a/blocks/activity_modules/lang/en/block_activity_modules.php b/blocks/activity_modules/lang/en/block_activity_modules.php
index f9dc7762818..e20fa026fd3 100644
--- a/blocks/activity_modules/lang/en/block_activity_modules.php
+++ b/blocks/activity_modules/lang/en/block_activity_modules.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/activity_modules/version.php b/blocks/activity_modules/version.php
index b8856c1aa4d..0383123c316 100644
--- a/blocks/activity_modules/version.php
+++ b/blocks/activity_modules/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage activity_modules
+ * @package    block_activity_modules
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/admin_bookmarks/block_admin_bookmarks.php b/blocks/admin_bookmarks/block_admin_bookmarks.php
index 09071eef681..c1dfa354054 100644
--- a/blocks/admin_bookmarks/block_admin_bookmarks.php
+++ b/blocks/admin_bookmarks/block_admin_bookmarks.php
@@ -17,13 +17,11 @@
 /**
  * Admin Bookmarks Block page.
  *
- * @package    block
- * @subpackage admin_bookmarks
+ * @package    block_admin_bookmarks
  * @copyright  2011 Moodle
  * @author     2006 vinkmar
  *             2011 Rossiani Wijaya (updated)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- *
  */
 
 /**
diff --git a/blocks/admin_bookmarks/create.php b/blocks/admin_bookmarks/create.php
index 6470cc99f4d..ab559a3a31e 100644
--- a/blocks/admin_bookmarks/create.php
+++ b/blocks/admin_bookmarks/create.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Create admin bookmarks.
+ *
+ * @package    block_admin_bookmarks
+ * @copyright  2006 vinkmar
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 require('../../config.php');
 
diff --git a/blocks/admin_bookmarks/delete.php b/blocks/admin_bookmarks/delete.php
index d73c7365c71..602ef79fb4d 100644
--- a/blocks/admin_bookmarks/delete.php
+++ b/blocks/admin_bookmarks/delete.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Delete admin bookmarks.
+ *
+ * @package    block_admin_bookmarks
+ * @copyright  2006 vinkmar
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 require('../../config.php');
 
diff --git a/blocks/admin_bookmarks/lang/en/block_admin_bookmarks.php b/blocks/admin_bookmarks/lang/en/block_admin_bookmarks.php
index bfdd4f6bd8f..8fae8b80994 100644
--- a/blocks/admin_bookmarks/lang/en/block_admin_bookmarks.php
+++ b/blocks/admin_bookmarks/lang/en/block_admin_bookmarks.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/admin_bookmarks/version.php b/blocks/admin_bookmarks/version.php
index 41b78790e88..8570e6c7705 100644
--- a/blocks/admin_bookmarks/version.php
+++ b/blocks/admin_bookmarks/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage admin_bookmarks
+ * @package    block_admin_bookmarks
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/badges/db/access.php b/blocks/badges/db/access.php
index 5804558ff37..abcdc46124b 100644
--- a/blocks/badges/db/access.php
+++ b/blocks/badges/db/access.php
@@ -17,8 +17,7 @@
 /**
  * My latest badges block capabilities.
  *
- * @package    core
- * @subpackage badges
+ * @package    block_badges
  * @copyright  2012 onwards Totara Learning Solutions Ltd {@link http://www.totaralms.com/}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @author     Yuliya Bozhko <yuliya.bozhko@totaralms.com>
diff --git a/blocks/blog_menu/block_blog_menu.php b/blocks/blog_menu/block_blog_menu.php
index 428792a9aed..71fd4221f27 100644
--- a/blocks/blog_menu/block_blog_menu.php
+++ b/blocks/blog_menu/block_blog_menu.php
@@ -17,8 +17,7 @@
 /**
  * Blog Menu Block page.
  *
- * @package    block
- * @subpackage blog_menu
+ * @package    block_blog_menu
  * @copyright  2009 Nicolas Connault
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/blog_menu/version.php b/blocks/blog_menu/version.php
index 76bcf1bc8b3..42467244885 100644
--- a/blocks/blog_menu/version.php
+++ b/blocks/blog_menu/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage blog_menu
+ * @package    block_blog_menu
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/blog_recent/block_blog_recent.php b/blocks/blog_recent/block_blog_recent.php
index e002c94649d..80befebffec 100644
--- a/blocks/blog_recent/block_blog_recent.php
+++ b/blocks/blog_recent/block_blog_recent.php
@@ -17,10 +17,9 @@
 /**
  * Recent Blog Entries Block page.
  *
- * @package    block
- * @subpackage blog_recent
- * @copyright  2009 Nicolas Connault
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   block_blog_recent
+ * @copyright 2009 Nicolas Connault
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
diff --git a/blocks/blog_recent/edit_form.php b/blocks/blog_recent/edit_form.php
index 0278895eead..6583ba8795f 100644
--- a/blocks/blog_recent/edit_form.php
+++ b/blocks/blog_recent/edit_form.php
@@ -18,7 +18,7 @@
 /**
  * Form for editing tag block instances.
  *
- * @package   moodlecore
+ * @package   block_blog_recent
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -26,6 +26,7 @@
 /**
  * Form for editing tag block instances.
  *
+ * @package   block_blog_recent
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/blog_recent/version.php b/blocks/blog_recent/version.php
index c0ecfb4f3f3..1781b6d9889 100644
--- a/blocks/blog_recent/version.php
+++ b/blocks/blog_recent/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage blog_recent
+ * @package    block_blog_recent
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/blog_tags/block_blog_tags.php b/blocks/blog_tags/block_blog_tags.php
index 9fb8b3a1bad..de32984c8ae 100644
--- a/blocks/blog_tags/block_blog_tags.php
+++ b/blocks/blog_tags/block_blog_tags.php
@@ -17,8 +17,7 @@
 /**
  * Blog tags block.
  *
- * @package    block
- * @subpackage blog_tags
+ * @package    block_blog_tags
  * @copyright  2006 Shane Elliott
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/blog_tags/edit_form.php b/blocks/blog_tags/edit_form.php
index 8d59fa97326..6f55551cf5e 100644
--- a/blocks/blog_tags/edit_form.php
+++ b/blocks/blog_tags/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * Form for editing Blog tags block instances.
  *
- * @package   moodlecore
+ * @package   block_blog_tags
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/blog_tags/lang/en/block_blog_tags.php b/blocks/blog_tags/lang/en/block_blog_tags.php
index 75bcb5ff66a..408e19012aa 100644
--- a/blocks/blog_tags/lang/en/block_blog_tags.php
+++ b/blocks/blog_tags/lang/en/block_blog_tags.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/blog_tags/version.php b/blocks/blog_tags/version.php
index 5ad522075da..e970974a30f 100644
--- a/blocks/blog_tags/version.php
+++ b/blocks/blog_tags/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage blog_tags
+ * @package    block_blog_tags
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/calendar_month/lang/en/block_calendar_month.php b/blocks/calendar_month/lang/en/block_calendar_month.php
index 696c1d726ad..7b666e734ed 100644
--- a/blocks/calendar_month/lang/en/block_calendar_month.php
+++ b/blocks/calendar_month/lang/en/block_calendar_month.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/calendar_month/version.php b/blocks/calendar_month/version.php
index 4461493cf37..442a7e4257b 100644
--- a/blocks/calendar_month/version.php
+++ b/blocks/calendar_month/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage calendar_moth
+ * @package    block_calendar_month
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/calendar_upcoming/lang/en/block_calendar_upcoming.php b/blocks/calendar_upcoming/lang/en/block_calendar_upcoming.php
index b111378550e..edf2add27fe 100644
--- a/blocks/calendar_upcoming/lang/en/block_calendar_upcoming.php
+++ b/blocks/calendar_upcoming/lang/en/block_calendar_upcoming.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/calendar_upcoming/version.php b/blocks/calendar_upcoming/version.php
index 07241a25d23..e3fc8759083 100644
--- a/blocks/calendar_upcoming/version.php
+++ b/blocks/calendar_upcoming/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage calendar_upcoming
+ * @package    block_calendar_upcoming
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/comments/block_comments.php b/blocks/comments/block_comments.php
index 527d02037c3..e65437238e8 100644
--- a/blocks/comments/block_comments.php
+++ b/blocks/comments/block_comments.php
@@ -17,8 +17,7 @@
 /**
  * The comments block
  *
- * @package   block
- * @subpackage comments
+ * @package    block_comments
  * @copyright 2009 Dongsheng Cai <dongsheng@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/comments/lib.php b/blocks/comments/lib.php
index 30cca1ee24b..454d1cde56d 100644
--- a/blocks/comments/lib.php
+++ b/blocks/comments/lib.php
@@ -17,8 +17,7 @@
 /**
  * The comments block helper functions and callbacks
  *
- * @package   block
- * @subpackage comments
+ * @package   block_comments
  * @copyright 2011 Dongsheng Cai <dongsheng@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/comments/version.php b/blocks/comments/version.php
index cb68dae0e7d..bbcc867781a 100644
--- a/blocks/comments/version.php
+++ b/blocks/comments/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage comments
+ * @package    block_comments
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/community/block_community.php b/blocks/community/block_community.php
index 56095812d1d..cead2b29308 100644
--- a/blocks/community/block_community.php
+++ b/blocks/community/block_community.php
@@ -1,5 +1,4 @@
 <?PHP
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -15,9 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/*
- * @package    blocks
- * @subpackage community
+/**
+ * @package block_community
  * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
  * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
diff --git a/blocks/community/communitycourse.php b/blocks/community/communitycourse.php
index b87920c09df..cebfc3aa56c 100644
--- a/blocks/community/communitycourse.php
+++ b/blocks/community/communitycourse.php
@@ -15,16 +15,15 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/*
- * @package    blocks
- * @subpackage community
- * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
- * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- *
+/**
  * This page display the community course search form.
  * It also handles adding a course to the community block.
  * It also handles downloading a course template.
+ *
+ * @package    block_community
+ * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
+ * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
  */
 
 require('../../config.php');
diff --git a/blocks/community/db/upgrade.php b/blocks/community/db/upgrade.php
index 2e56d5c97c8..421b1f65615 100644
--- a/blocks/community/db/upgrade.php
+++ b/blocks/community/db/upgrade.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -33,7 +32,7 @@
  * before any action that may take longer time to finish.
  *
  * @since 2.0
- * @package blocks
+ * @package block_community
  * @copyright 2010 Jerome Mouneyrac
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/community/forms.php b/blocks/community/forms.php
index b92dd5c1fe5..02b679e0c88 100644
--- a/blocks/community/forms.php
+++ b/blocks/community/forms.php
@@ -1,5 +1,4 @@
 <?php
-
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
 // This file is part of Moodle - http://moodle.org/                      //
@@ -20,14 +19,13 @@
 //                                                                       //
 ///////////////////////////////////////////////////////////////////////////
 
-/*
- * @package    blocks
- * @subpackage community
+/**
+ * Form for community search
+ *
+ * @package    block_community
  * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
  * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
- *
- * Form for community search
  */
 
 require_once($CFG->libdir . '/formslib.php');
diff --git a/blocks/community/lang/en/block_community.php b/blocks/community/lang/en/block_community.php
index fafe99ff57f..eadea09a6df 100644
--- a/blocks/community/lang/en/block_community.php
+++ b/blocks/community/lang/en/block_community.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/community/locallib.php b/blocks/community/locallib.php
index bbfc9894572..330d3da7893 100644
--- a/blocks/community/locallib.php
+++ b/blocks/community/locallib.php
@@ -14,15 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/*
- * @package    blocks
- * @subpackage community
+/**
+ * Community library
+ *
+ * @package    block_community
  * @author     Jerome Mouneyrac <jerome@mouneyrac.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
  * @copyright  (C) 1999 onwards Martin Dougiamas  http://dougiamas.com
  *
- * Community library
-*/
+ *
+ */
 
 class block_community_manager {
 
diff --git a/blocks/community/renderer.php b/blocks/community/renderer.php
index fd01814f9d2..c945b00b78a 100644
--- a/blocks/community/renderer.php
+++ b/blocks/community/renderer.php
@@ -22,8 +22,7 @@
 
 /**
  * Block community renderer.
- * @package    blocks
- * @subpackage community
+ * @package   block_community
  * @copyright 2010 Moodle Pty Ltd (http://moodle.com)
  * @author    Jerome Mouneyrac
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/community/version.php b/blocks/community/version.php
index 66dc3df9ec4..ddb813ac87c 100644
--- a/blocks/community/version.php
+++ b/blocks/community/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage community
+ * @package    block_community
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/completionstatus/block_completionstatus.php b/blocks/completionstatus/block_completionstatus.php
index e92f1bcb322..59688f443d1 100644
--- a/blocks/completionstatus/block_completionstatus.php
+++ b/blocks/completionstatus/block_completionstatus.php
@@ -17,8 +17,7 @@
 /**
  * Block for displayed logged in user's course completion status
  *
- * @package    block
- * @subpackage completion
+ * @package    block_completionstatus
  * @copyright  2009-2012 Catalyst IT Ltd
  * @author     Aaron Barnes <aaronb@catalyst.net.nz>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/completionstatus/db/upgrade.php b/blocks/completionstatus/db/upgrade.php
index d161a36334d..401040ad5f6 100644
--- a/blocks/completionstatus/db/upgrade.php
+++ b/blocks/completionstatus/db/upgrade.php
@@ -32,7 +32,7 @@
  * before any action that may take longer time to finish.
  *
  * @since 2.0
- * @package blocks
+ * @package block_completionstatus
  * @copyright 2012 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/completionstatus/details.php b/blocks/completionstatus/details.php
index be4cd2fd4c0..8e72d6f146e 100644
--- a/blocks/completionstatus/details.php
+++ b/blocks/completionstatus/details.php
@@ -17,8 +17,7 @@
 /**
  * Block for displaying logged in user's course completion status
  *
- * @package    block
- * @subpackage completion
+ * @package    block_completionstatus
  * @copyright  2009-2012 Catalyst IT Ltd
  * @author     Aaron Barnes <aaronb@catalyst.net.nz>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/completionstatus/version.php b/blocks/completionstatus/version.php
index 648b01cd48f..da071f95010 100644
--- a/blocks/completionstatus/version.php
+++ b/blocks/completionstatus/version.php
@@ -17,8 +17,7 @@
 /**
  * Version info
  *
- * @package    block
- * @subpackage completion
+ * @package    block_completionstatus
  * @copyright  2009 Catalyst IT Ltd
  * @author     Aaron Barnes <aaronb@catalyst.net.nz>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/course_list/block_course_list.php b/blocks/course_list/block_course_list.php
index d4b9f941c1b..df725de0848 100644
--- a/blocks/course_list/block_course_list.php
+++ b/blocks/course_list/block_course_list.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Course list block.
+ *
+ * @package    block_course_list
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 include_once($CFG->dirroot . '/course/lib.php');
 include_once($CFG->libdir . '/coursecatlib.php');
diff --git a/blocks/course_list/lang/en/block_course_list.php b/blocks/course_list/lang/en/block_course_list.php
index 6d8589a0f6f..da4e52948ae 100644
--- a/blocks/course_list/lang/en/block_course_list.php
+++ b/blocks/course_list/lang/en/block_course_list.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/course_list/settings.php b/blocks/course_list/settings.php
index 1af7620f5e2..0d8a9ef21bd 100644
--- a/blocks/course_list/settings.php
+++ b/blocks/course_list/settings.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Course list block settings
+ *
+ * @package    block_course_list
+ * @copyright  2007 Petr Skoda
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/blocks/course_list/version.php b/blocks/course_list/version.php
index 8d09127c689..15f93597322 100644
--- a/blocks/course_list/version.php
+++ b/blocks/course_list/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage course_list
+ * @package    block_course_list
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/course_summary/block_course_summary.php b/blocks/course_summary/block_course_summary.php
index 504c62663b6..281aba3fad8 100644
--- a/blocks/course_summary/block_course_summary.php
+++ b/blocks/course_summary/block_course_summary.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Course summary block
+ *
+ * @package    block_course_summary
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_course_summary extends block_base {
     function init() {
diff --git a/blocks/course_summary/db/upgrade.php b/blocks/course_summary/db/upgrade.php
index 932bf2d109c..6e2b6f6266a 100644
--- a/blocks/course_summary/db/upgrade.php
+++ b/blocks/course_summary/db/upgrade.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -33,7 +32,7 @@
  * before any action that may take longer time to finish.
  *
  * @since 2.0
- * @package blocks
+ * @package block_course_summary
  * @copyright 2012 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/course_summary/version.php b/blocks/course_summary/version.php
index 9539a24f982..4805e86393b 100644
--- a/blocks/course_summary/version.php
+++ b/blocks/course_summary/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage course_summary
+ * @package    block_course_summary
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/edit_form.php b/blocks/edit_form.php
index 44e514a4ee7..19624eb9ea0 100644
--- a/blocks/edit_form.php
+++ b/blocks/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -21,8 +20,7 @@
  * It works with the {@link block_edit_form} class, or rather the particular
  * subclass defined by this block, to do the editing.
  *
- * @package    core
- * @subpackage block
+ * @package    core_block
  * @copyright  2009 Tim Hunt
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/feedback/block_feedback.php b/blocks/feedback/block_feedback.php
index 5d41a50e585..fd066232bf3 100644
--- a/blocks/feedback/block_feedback.php
+++ b/blocks/feedback/block_feedback.php
@@ -1,4 +1,27 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Feedback block.
+ *
+ * @package    block_feedback
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
 if (is_file($CFG->dirroot.'/mod/feedback/lib.php')) {
     require_once($CFG->dirroot.'/mod/feedback/lib.php');
     define('FEEDBACK_BLOCK_LIB_IS_OK', true);
diff --git a/blocks/feedback/db/install.php b/blocks/feedback/db/install.php
index 9b7f76dfd63..559248b3ecb 100644
--- a/blocks/feedback/db/install.php
+++ b/blocks/feedback/db/install.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Feedback block installation.
+ *
+ * @package    block_feedback
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 function xmldb_block_feedback_install() {
     global $DB;
diff --git a/blocks/feedback/lang/en/block_feedback.php b/blocks/feedback/lang/en/block_feedback.php
index 45874f5dc28..982755ed372 100644
--- a/blocks/feedback/lang/en/block_feedback.php
+++ b/blocks/feedback/lang/en/block_feedback.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/feedback/version.php b/blocks/feedback/version.php
index b8b5dfbf3dc..44475c5be07 100644
--- a/blocks/feedback/version.php
+++ b/blocks/feedback/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage feedback
+ * @package    block_feedback
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/glossary_random/backup/moodle2/restore_glossary_random_block_task.class.php b/blocks/glossary_random/backup/moodle2/restore_glossary_random_block_task.class.php
index 6b4b91802b0..017e407897e 100644
--- a/blocks/glossary_random/backup/moodle2/restore_glossary_random_block_task.class.php
+++ b/blocks/glossary_random/backup/moodle2/restore_glossary_random_block_task.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package block_glossary_random
  * @subpackage backup-moodle2
  * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/glossary_random/block_glossary_random.php b/blocks/glossary_random/block_glossary_random.php
index db094c95fe5..de12315940f 100644
--- a/blocks/glossary_random/block_glossary_random.php
+++ b/blocks/glossary_random/block_glossary_random.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Glossary Random block.
+ *
+ * @package   block_glossary_random
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 define('BGR_RANDOMLY',     '0');
 define('BGR_LASTMODIFIED', '1');
diff --git a/blocks/glossary_random/edit_form.php b/blocks/glossary_random/edit_form.php
index 24b2df1b921..ef1cf344015 100644
--- a/blocks/glossary_random/edit_form.php
+++ b/blocks/glossary_random/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * Form for editing HTML block instances.
  *
- * @package   moodlecore
+ * @package   block_glossary_random
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/glossary_random/lang/en/block_glossary_random.php b/blocks/glossary_random/lang/en/block_glossary_random.php
index 7aa54b66bd3..57285f4bb6f 100644
--- a/blocks/glossary_random/lang/en/block_glossary_random.php
+++ b/blocks/glossary_random/lang/en/block_glossary_random.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/glossary_random/version.php b/blocks/glossary_random/version.php
index 923a310e75e..d1d6fb0ed65 100644
--- a/blocks/glossary_random/version.php
+++ b/blocks/glossary_random/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage glossary_random
+ * @package    block_glossary_random
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/html/backup/moodle1/lib.php b/blocks/html/backup/moodle1/lib.php
index 6373a017571..3830ba99e99 100644
--- a/blocks/html/backup/moodle1/lib.php
+++ b/blocks/html/backup/moodle1/lib.php
@@ -1,4 +1,18 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
  * Provides support for the conversion of moodle1 backup to the moodle2 format
diff --git a/blocks/html/backup/moodle2/backup_html_block_task.class.php b/blocks/html/backup/moodle2/backup_html_block_task.class.php
index 8b0e15270fd..7e1bccc10ea 100644
--- a/blocks/html/backup/moodle2/backup_html_block_task.class.php
+++ b/blocks/html/backup/moodle2/backup_html_block_task.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,10 +15,10 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package    block_html
  * @subpackage backup-moodle2
- * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
diff --git a/blocks/html/backup/moodle2/restore_html_block_task.class.php b/blocks/html/backup/moodle2/restore_html_block_task.class.php
index dab463fddaa..c3ce29b9f35 100644
--- a/blocks/html/backup/moodle2/restore_html_block_task.class.php
+++ b/blocks/html/backup/moodle2/restore_html_block_task.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package   block_html
  * @subpackage backup-moodle2
  * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/html/block_html.php b/blocks/html/block_html.php
index 67b108fb5bd..9fe64c9eb11 100644
--- a/blocks/html/block_html.php
+++ b/blocks/html/block_html.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/html/db/upgrade.php b/blocks/html/db/upgrade.php
index ba0cbe2c7af..cef37a7e066 100644
--- a/blocks/html/db/upgrade.php
+++ b/blocks/html/db/upgrade.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -21,10 +20,11 @@
  * @since 2.0
  * @package block_html
  * @copyright 2010 Dongsheng Cai
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
+ * Upgrade code for the HTML block.
  *
  * @param int $oldversion
  * @param object $block
@@ -33,11 +33,11 @@ function xmldb_block_html_upgrade($oldversion) {
     global $CFG, $DB;
 
     // Moodle v2.3.0 release upgrade line
-    // Put any upgrade step following this
+    // Put any upgrade step following this.
 
 
     // Moodle v2.4.0 release upgrade line
-    // Put any upgrade step following this
+    // Put any upgrade step following this.
 
 
     // Moodle v2.5.0 release upgrade line.
diff --git a/blocks/html/edit_form.php b/blocks/html/edit_form.php
index edb57055fd0..1f04ea71a58 100644
--- a/blocks/html/edit_form.php
+++ b/blocks/html/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/html/lang/en/block_html.php b/blocks/html/lang/en/block_html.php
index 5ee8925dc9a..9edda7f8301 100644
--- a/blocks/html/lang/en/block_html.php
+++ b/blocks/html/lang/en/block_html.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/html/lib.php b/blocks/html/lib.php
index c236d9f5800..5c9327a4684 100644
--- a/blocks/html/lib.php
+++ b/blocks/html/lib.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/html/settings.php b/blocks/html/settings.php
index 59cb79760d5..11c3a6e881c 100644
--- a/blocks/html/settings.php
+++ b/blocks/html/settings.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Settings for the HTML block
+ *
+ * @copyright 2012 Aaron Barnes
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @package   block_html
+ */
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/blocks/html/version.php b/blocks/html/version.php
index ba33016b838..2447f1f1790 100644
--- a/blocks/html/version.php
+++ b/blocks/html/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage html
+ * @package    block_html
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/login/block_login.php b/blocks/login/block_login.php
index e834e114526..be630645958 100644
--- a/blocks/login/block_login.php
+++ b/blocks/login/block_login.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Login block
+ *
+ * @package   block_login
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_login extends block_base {
     function init() {
diff --git a/blocks/login/lang/en/block_login.php b/blocks/login/lang/en/block_login.php
index 73de108b9ac..9237cabdf17 100644
--- a/blocks/login/lang/en/block_login.php
+++ b/blocks/login/lang/en/block_login.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/login/version.php b/blocks/login/version.php
index 62fabfba166..9d4598cbb08 100644
--- a/blocks/login/version.php
+++ b/blocks/login/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage login
+ * @package    block_login
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/mentees/block_mentees.php b/blocks/mentees/block_mentees.php
index 95c30598a8f..bbb76a19d8b 100644
--- a/blocks/mentees/block_mentees.php
+++ b/blocks/mentees/block_mentees.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Mentees block.
+ *
+ * @package    block_mentees
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_mentees extends block_base {
 
diff --git a/blocks/mentees/edit_form.php b/blocks/mentees/edit_form.php
index 5b3430d7939..333497d8106 100644
--- a/blocks/mentees/edit_form.php
+++ b/blocks/mentees/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * Form for editing Mentees block instances.
  *
- * @package   moodlecore
+ * @package   block_mentees
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/mentees/version.php b/blocks/mentees/version.php
index ce34b9155ae..2e3b0d51fcc 100644
--- a/blocks/mentees/version.php
+++ b/blocks/mentees/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage mentees
+ * @package    block_mentees
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/messages/block_messages.php b/blocks/messages/block_messages.php
index a9979c63522..c9f93b206fc 100644
--- a/blocks/messages/block_messages.php
+++ b/blocks/messages/block_messages.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Mentees block.
+ *
+ * @package    block_messages
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_messages extends block_base {
     function init() {
diff --git a/blocks/messages/lang/en/block_messages.php b/blocks/messages/lang/en/block_messages.php
index f4b6192a17f..952ac862d91 100644
--- a/blocks/messages/lang/en/block_messages.php
+++ b/blocks/messages/lang/en/block_messages.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/messages/version.php b/blocks/messages/version.php
index e860a8f99b4..ed1cc75e83c 100644
--- a/blocks/messages/version.php
+++ b/blocks/messages/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage messages
+ * @package    block_messages
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/mnet_hosts/block_mnet_hosts.php b/blocks/mnet_hosts/block_mnet_hosts.php
index e776a4565d8..4932b919bd6 100644
--- a/blocks/mnet_hosts/block_mnet_hosts.php
+++ b/blocks/mnet_hosts/block_mnet_hosts.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * MNet hosts block.
+ *
+ * @package    block_mnet_hosts
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_mnet_hosts extends block_list {
     function init() {
diff --git a/blocks/mnet_hosts/lang/en/block_mnet_hosts.php b/blocks/mnet_hosts/lang/en/block_mnet_hosts.php
index 63507756e8f..eae2d15848e 100644
--- a/blocks/mnet_hosts/lang/en/block_mnet_hosts.php
+++ b/blocks/mnet_hosts/lang/en/block_mnet_hosts.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/mnet_hosts/version.php b/blocks/mnet_hosts/version.php
index 633740b2b6d..50681765406 100644
--- a/blocks/mnet_hosts/version.php
+++ b/blocks/mnet_hosts/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage mnet_hosts
+ * @package    block_mnet_hosts
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/moodleblock.class.php b/blocks/moodleblock.class.php
index 461baf15972..87f4707044c 100644
--- a/blocks/moodleblock.class.php
+++ b/blocks/moodleblock.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * This file contains the parent class for moodle blocks, block_base.
  *
- * @package    core
- * @subpackage block
+ * @package    core_block
  * @license    http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
@@ -43,7 +41,7 @@ define('BLOCK_TYPE_TREE',    3);
  * Class for describing a moodle block, all Moodle blocks derive from this class
  *
  * @author Jon Papaioannou
- * @package blocks
+ * @package core_block
  */
 class block_base {
 
@@ -756,7 +754,7 @@ EOD;
  * $this->content->icons, instead of $this->content->text.
  *
  * @author Jon Papaioannou
- * @package blocks
+ * @package core_block
  */
 
 class block_list extends block_base {
@@ -802,7 +800,7 @@ class block_list extends block_base {
  * not in a separate array.
  *
  * @author Alan Trick
- * @package blocks
+ * @package core_block
  * @internal this extends block_list so we get is_empty() for free
  */
 class block_tree extends block_list {
diff --git a/blocks/myprofile/block_myprofile.php b/blocks/myprofile/block_myprofile.php
index 73daf368d97..48909b12feb 100644
--- a/blocks/myprofile/block_myprofile.php
+++ b/blocks/myprofile/block_myprofile.php
@@ -21,8 +21,7 @@
  * can easily check the logged-in user matches the person
  * operating the computer.
  *
- * @package    block
- * @subpackage myprofile
+ * @package    block_myprofile
  * @copyright  2010 Remote-Learner.net
  * @author     Olav Jordan <olav.jordan@remote-learner.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/myprofile/edit_form.php b/blocks/myprofile/edit_form.php
index 4500c0e9ae6..2fc09cfdf64 100644
--- a/blocks/myprofile/edit_form.php
+++ b/blocks/myprofile/edit_form.php
@@ -19,8 +19,7 @@ defined('MOODLE_INTERNAL') || die();
 /**
  * Form for editing profile block settings
  *
- * @package    block
- * @subpackage myprofile
+ * @package    block_myprofile
  * @copyright  2010 Remote-Learner.net
  * @author     Olav Jordan <olav.jordan@remote-learner.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/myprofile/lang/en/block_myprofile.php b/blocks/myprofile/lang/en/block_myprofile.php
index bca6998ed14..57dc5d7947a 100644
--- a/blocks/myprofile/lang/en/block_myprofile.php
+++ b/blocks/myprofile/lang/en/block_myprofile.php
@@ -17,8 +17,7 @@
 /**
  * Strings for component 'block_myprofile', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package    block
- * @subpackage myprofile
+ * @package    block_myprofile
  * @copyright  2010 Remote-Learner.net
  * @author     Olav Jordan <olav.jordan@remote-learner.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/myprofile/version.php b/blocks/myprofile/version.php
index 38ce8f8c379..d72be429165 100644
--- a/blocks/myprofile/version.php
+++ b/blocks/myprofile/version.php
@@ -17,8 +17,7 @@
 /**
  * Current user info block.
  *
- * @package    block
- * @subpackage myprofile
+ * @package    block_myprofile
  * @copyright  2010 Remote-Learner.net
  * @author     Olav Jordan <olav.jordan@remote-learner.ca>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/navigation/db/upgrade.php b/blocks/navigation/db/upgrade.php
index 36b093f4f81..a1a8367310c 100644
--- a/blocks/navigation/db/upgrade.php
+++ b/blocks/navigation/db/upgrade.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -33,7 +32,7 @@
  * before any action that may take longer time to finish.
  *
  * @since 2.0
- * @package blocks
+ * @package block_navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -56,14 +55,14 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
     global $DB;
 
     // Moodle v2.2.0 release upgrade line
-    // Put any upgrade step following this
+    // Put any upgrade step following this.
 
     // Moodle v2.3.0 release upgrade line
-    // Put any upgrade step following this
+    // Put any upgrade step following this.
 
 
     // Moodle v2.4.0 release upgrade line
-    // Put any upgrade step following this
+    // Put any upgrade step following this.
 
 
     // Moodle v2.5.0 release upgrade line.
diff --git a/blocks/navigation/lang/en/block_navigation.php b/blocks/navigation/lang/en/block_navigation.php
index ebfdda92a14..432b0edf38b 100644
--- a/blocks/navigation/lang/en/block_navigation.php
+++ b/blocks/navigation/lang/en/block_navigation.php
@@ -19,7 +19,7 @@
  * This file contains language strings used in the global navigation block
  *
  * @since 2.0
- * @package blocks
+ * @package block_navigation
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/news_items/block_news_items.php b/blocks/news_items/block_news_items.php
index 5ecbec283fa..092ae4bb46a 100644
--- a/blocks/news_items/block_news_items.php
+++ b/blocks/news_items/block_news_items.php
@@ -1,5 +1,34 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+/**
+ * This file contains the news item block class, based upon block_base.
+ *
+ * @package    block_news_items
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+/**
+ * Class block_news_items
+ *
+ * @package    block_news_items
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 class block_news_items extends block_base {
     function init() {
         $this->title = get_string('pluginname', 'block_news_items');
diff --git a/blocks/news_items/lang/en/block_news_items.php b/blocks/news_items/lang/en/block_news_items.php
index ba638ad98de..92d9be4e9f6 100644
--- a/blocks/news_items/lang/en/block_news_items.php
+++ b/blocks/news_items/lang/en/block_news_items.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/news_items/version.php b/blocks/news_items/version.php
index 972c082fc32..6c8db3f2ea9 100644
--- a/blocks/news_items/version.php
+++ b/blocks/news_items/version.php
@@ -17,14 +17,13 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage news_items
+ * @package    block_news_items
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2013110500;        // The current plugin version (Date: YYYYMMDDXX)
-$plugin->requires  = 2013110500;        // Requires this Moodle version
+$plugin->version   = 2013110500;         // The current plugin version (Date: YYYYMMDDXX)
+$plugin->requires  = 2013110500;         // Requires this Moodle version
 $plugin->component = 'block_news_items'; // Full name of the plugin (used for diagnostics)
diff --git a/blocks/online_users/block_online_users.php b/blocks/online_users/block_online_users.php
index 50ff41a0505..9682f4f88bc 100644
--- a/blocks/online_users/block_online_users.php
+++ b/blocks/online_users/block_online_users.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Online users block.
+ *
+ * @package    block_online_users
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 /**
  * This block needs to be reworked.
diff --git a/blocks/online_users/settings.php b/blocks/online_users/settings.php
index eb7753c3bd7..b9d7d81524d 100644
--- a/blocks/online_users/settings.php
+++ b/blocks/online_users/settings.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Online users block settings.
+ *
+ * @package    block_online_users
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/blocks/online_users/version.php b/blocks/online_users/version.php
index 9982fa947f9..138df538d12 100644
--- a/blocks/online_users/version.php
+++ b/blocks/online_users/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage online_users
+ * @package    block_online_users
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/participants/block_participants.php b/blocks/participants/block_participants.php
index 82889f811c0..3cc6a8b9db5 100644
--- a/blocks/participants/block_participants.php
+++ b/blocks/participants/block_participants.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Participants block
+ *
+ * @package    block_participants
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_participants extends block_list {
     function init() {
diff --git a/blocks/participants/lang/en/block_participants.php b/blocks/participants/lang/en/block_participants.php
index 5efd9f686e2..bdddf5f9139 100644
--- a/blocks/participants/lang/en/block_participants.php
+++ b/blocks/participants/lang/en/block_participants.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/participants/version.php b/blocks/participants/version.php
index 0fa81593a4b..8c0bd35be42 100644
--- a/blocks/participants/version.php
+++ b/blocks/participants/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage participants
+ * @package    block_participants
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/private_files/block_private_files.php b/blocks/private_files/block_private_files.php
index bf4cc89c10b..e46d2ad3ade 100644
--- a/blocks/private_files/block_private_files.php
+++ b/blocks/private_files/block_private_files.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/private_files/edit.php b/blocks/private_files/edit.php
index 6dc243e5666..785349eb049 100644
--- a/blocks/private_files/edit.php
+++ b/blocks/private_files/edit.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/private_files/lang/en/block_private_files.php b/blocks/private_files/lang/en/block_private_files.php
index 64321bbd759..d83641f1a03 100644
--- a/blocks/private_files/lang/en/block_private_files.php
+++ b/blocks/private_files/lang/en/block_private_files.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/private_files/renderer.php b/blocks/private_files/renderer.php
index f84d2d7dab6..d3570536aa8 100644
--- a/blocks/private_files/renderer.php
+++ b/blocks/private_files/renderer.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -15,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-
 /**
  * Print private files tree
  *
@@ -24,7 +22,6 @@
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
 class block_private_files_renderer extends plugin_renderer_base {
diff --git a/blocks/private_files/version.php b/blocks/private_files/version.php
index 14eb95b6e9b..60c5180f606 100644
--- a/blocks/private_files/version.php
+++ b/blocks/private_files/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage private_files
+ * @package    block_private_files
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/quiz_results/backup/moodle2/restore_quiz_results_block_task.class.php b/blocks/quiz_results/backup/moodle2/restore_quiz_results_block_task.class.php
index 1ba43340db1..36c540765cf 100644
--- a/blocks/quiz_results/backup/moodle2/restore_quiz_results_block_task.class.php
+++ b/blocks/quiz_results/backup/moodle2/restore_quiz_results_block_task.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,16 +15,13 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package    moodlecore
- * @subpackage backup-moodle2
+ * @package    block_quiz_results
  * @copyright  2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
-
 defined('MOODLE_INTERNAL') || die();
 
-
 /**
  * Specialised restore task for the quiz_results block
  * (using execute_after_tasks for recoding of target quiz)
diff --git a/blocks/quiz_results/block_quiz_results.php b/blocks/quiz_results/block_quiz_results.php
index 26b9648d0e0..137a62baa1c 100644
--- a/blocks/quiz_results/block_quiz_results.php
+++ b/blocks/quiz_results/block_quiz_results.php
@@ -17,8 +17,7 @@
 /**
  * Classes to enforce the various access rules that can apply to a quiz.
  *
- * @package    block
- * @subpackage quiz_results
+ * @package    block_quiz_results
  * @copyright  2009 Tim Hunt
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -35,8 +34,7 @@ require_once($CFG->dirroot . '/mod/quiz/lib.php');
  * This block can be added to a course page or a quiz page to display of list of
  * the best/worst students/groups in a particular quiz.
  *
- * @package    block
- * @subpackage quiz_results
+ * @package    block_quiz_results
  * @copyright  2009 Tim Hunt
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/quiz_results/edit_form.php b/blocks/quiz_results/edit_form.php
index 35231b738cf..bddb7057671 100644
--- a/blocks/quiz_results/edit_form.php
+++ b/blocks/quiz_results/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * Defines the form for editing Quiz results block instances.
  *
- * @package   moodlecore
+ * @package    block_quiz_results
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/quiz_results/lang/en/block_quiz_results.php b/blocks/quiz_results/lang/en/block_quiz_results.php
index 062565a1f9d..f6d758aa372 100644
--- a/blocks/quiz_results/lang/en/block_quiz_results.php
+++ b/blocks/quiz_results/lang/en/block_quiz_results.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,8 +17,7 @@
 /**
  * Strings for component 'block_quiz_results', language 'en', branch 'MOODLE_20_STABLE'
  *
- * @package    block
- * @subpackage quiz_results
+ * @package    block_quiz_results
  * @copyright  1999 onwards Martin Dougiamas  {@link http://moodle.com}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/quiz_results/version.php b/blocks/quiz_results/version.php
index 94ce56f2111..80fb3aa191d 100644
--- a/blocks/quiz_results/version.php
+++ b/blocks/quiz_results/version.php
@@ -17,8 +17,7 @@
 /**
  * Version information for the block_quiz_results plugin.
  *
- * @package    block
- * @subpackage quiz_results
+ * @package    block_quiz_results
  * @copyright  2011 The Open University
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/rss_client/backup/moodle1/lib.php b/blocks/rss_client/backup/moodle1/lib.php
index d6983656adf..b87e0a398e2 100644
--- a/blocks/rss_client/backup/moodle1/lib.php
+++ b/blocks/rss_client/backup/moodle1/lib.php
@@ -1,4 +1,18 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
  * Provides support for the conversion of moodle1 backup to the moodle2 format
diff --git a/blocks/rss_client/backup/moodle2/backup_rss_client_block_task.class.php b/blocks/rss_client/backup/moodle2/backup_rss_client_block_task.class.php
index 45a4df25d6a..f3500c0d23e 100644
--- a/blocks/rss_client/backup/moodle2/backup_rss_client_block_task.class.php
+++ b/blocks/rss_client/backup/moodle2/backup_rss_client_block_task.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package    block_rss_client
  * @subpackage backup-moodle2
  * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/rss_client/backup/moodle2/backup_rss_client_stepslib.php b/blocks/rss_client/backup/moodle2/backup_rss_client_stepslib.php
index d9e24d92a7f..437d7089d93 100644
--- a/blocks/rss_client/backup/moodle2/backup_rss_client_stepslib.php
+++ b/blocks/rss_client/backup/moodle2/backup_rss_client_stepslib.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package    block_rss_client
  * @subpackage backup-moodle2
  * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/rss_client/backup/moodle2/restore_rss_client_block_task.class.php b/blocks/rss_client/backup/moodle2/restore_rss_client_block_task.class.php
index e3e29ff5294..cf99891df80 100644
--- a/blocks/rss_client/backup/moodle2/restore_rss_client_block_task.class.php
+++ b/blocks/rss_client/backup/moodle2/restore_rss_client_block_task.class.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package    block_rss_client
  * @subpackage backup-moodle2
  * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/rss_client/backup/moodle2/restore_rss_client_stepslib.php b/blocks/rss_client/backup/moodle2/restore_rss_client_stepslib.php
index c23d7b970c4..cdd978349b1 100644
--- a/blocks/rss_client/backup/moodle2/restore_rss_client_stepslib.php
+++ b/blocks/rss_client/backup/moodle2/restore_rss_client_stepslib.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -16,7 +15,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * @package moodlecore
+ * @package    block_rss_client
  * @subpackage backup-moodle2
  * @copyright 2003 onwards Eloy Lafuente (stronk7) {@link http://stronk7.com}
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/blocks/rss_client/block_rss_client.php b/blocks/rss_client/block_rss_client.php
index 2f492982ab8..30b623cb374 100644
--- a/blocks/rss_client/block_rss_client.php
+++ b/blocks/rss_client/block_rss_client.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * A block which displays Remote feeds
  *
- * @package    rss_client
+ * @package   block_rss_client
  * @copyright  Daryl Hawes
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL
  */
diff --git a/blocks/rss_client/edit_form.php b/blocks/rss_client/edit_form.php
index e696c460ccc..f8fcf89195f 100644
--- a/blocks/rss_client/edit_form.php
+++ b/blocks/rss_client/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * Form for editing RSS client block instances.
  *
- * @package   moodlecore
+ * @package   block_rss_client
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/rss_client/editfeed.php b/blocks/rss_client/editfeed.php
index 110c4d2e555..a1eaf2f3136 100644
--- a/blocks/rss_client/editfeed.php
+++ b/blocks/rss_client/editfeed.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * Script to let a user edit the properties of a particular RSS feed.
  *
- * @package   moodlecore
+ * @package   block_rss_client
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/rss_client/lang/en/block_rss_client.php b/blocks/rss_client/lang/en/block_rss_client.php
index 7b10e4c74da..cb2db5c6ad2 100644
--- a/blocks/rss_client/lang/en/block_rss_client.php
+++ b/blocks/rss_client/lang/en/block_rss_client.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/rss_client/managefeeds.php b/blocks/rss_client/managefeeds.php
index 2252bc9874e..2300fa691f0 100644
--- a/blocks/rss_client/managefeeds.php
+++ b/blocks/rss_client/managefeeds.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * Script to let a user manage their RSS feeds.
  *
- * @package   moodlecore
+ * @package   block_rss_client
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/rss_client/settings.php b/blocks/rss_client/settings.php
index ff119ac6e4d..cb98280bd42 100644
--- a/blocks/rss_client/settings.php
+++ b/blocks/rss_client/settings.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Settings for the RSS client block.
+ *
+ * @package   block_rss_client
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 defined('MOODLE_INTERNAL') || die;
 
diff --git a/blocks/rss_client/version.php b/blocks/rss_client/version.php
index fc6b8f0b04c..810cfa67ec9 100644
--- a/blocks/rss_client/version.php
+++ b/blocks/rss_client/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage rss_client
+ * @package    block_rss_client
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/rss_client/viewfeed.php b/blocks/rss_client/viewfeed.php
index 26451d6b742..252431fef4c 100644
--- a/blocks/rss_client/viewfeed.php
+++ b/blocks/rss_client/viewfeed.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * Script to let a user edit the properties of a particular RSS feed.
  *
- * @package   moodlecore
+ * @package   block_rss_client
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/search_forums/block_search_forums.php b/blocks/search_forums/block_search_forums.php
index 7466f7106c9..2bf7d6c1bf0 100644
--- a/blocks/search_forums/block_search_forums.php
+++ b/blocks/search_forums/block_search_forums.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Block to search forum posts.
+ *
+ * @package   block_search_forums
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_search_forums extends block_base {
     function init() {
diff --git a/blocks/search_forums/lang/en/block_search_forums.php b/blocks/search_forums/lang/en/block_search_forums.php
index 476cf15cb0f..1e4b32efa79 100644
--- a/blocks/search_forums/lang/en/block_search_forums.php
+++ b/blocks/search_forums/lang/en/block_search_forums.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/search_forums/version.php b/blocks/search_forums/version.php
index 7709e793e2c..f1e6332c7ca 100644
--- a/blocks/search_forums/version.php
+++ b/blocks/search_forums/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage search_forums
+ * @package    block_search_forums
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/selfcompletion/block_selfcompletion.php b/blocks/selfcompletion/block_selfcompletion.php
index fe0d3af9279..87e9e4bdf87 100644
--- a/blocks/selfcompletion/block_selfcompletion.php
+++ b/blocks/selfcompletion/block_selfcompletion.php
@@ -1,27 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-///////////////////////////////////////////////////////////////////////////
-//                                                                       //
-// NOTICE OF COPYRIGHT                                                   //
-//                                                                       //
-// Moodle - Modular Object-Oriented Dynamic Learning Environment         //
-//          http://moodle.com                                            //
-//                                                                       //
-// Copyright (C) 1999 onwards Martin Dougiamas  http://dougiamas.com     //
-//                                                                       //
-// This program is free software; you can redistribute it and/or modify  //
-// it under the terms of the GNU General Public License as published by  //
-// the Free Software Foundation; either version 2 of the License, or     //
-// (at your option) any later version.                                   //
-//                                                                       //
-// This program is distributed in the hope that it will be useful,       //
-// but WITHOUT ANY WARRANTY; without even the implied warranty of        //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         //
-// GNU General Public License for more details:                          //
-//                                                                       //
-//          http://www.gnu.org/copyleft/gpl.html                         //
-//                                                                       //
-///////////////////////////////////////////////////////////////////////////
+/**
+ * Self completion block.
+ *
+ * @package   block_selfcompletion
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 require_once($CFG->libdir.'/completionlib.php');
 
diff --git a/blocks/selfcompletion/db/upgrade.php b/blocks/selfcompletion/db/upgrade.php
index 10700484256..2a98e9a19ad 100644
--- a/blocks/selfcompletion/db/upgrade.php
+++ b/blocks/selfcompletion/db/upgrade.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -33,7 +32,7 @@
  * before any action that may take longer time to finish.
  *
  * @since 2.0
- * @package blocks
+ * @package    block_selfcompletion
  * @copyright 2012 Mark Nelson <markn@moodle.com>
  * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/selfcompletion/lang/en/block_selfcompletion.php b/blocks/selfcompletion/lang/en/block_selfcompletion.php
index 457c77c87e8..5d5f340f90a 100644
--- a/blocks/selfcompletion/lang/en/block_selfcompletion.php
+++ b/blocks/selfcompletion/lang/en/block_selfcompletion.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/selfcompletion/version.php b/blocks/selfcompletion/version.php
index f91440db1cc..dec6ac26939 100644
--- a/blocks/selfcompletion/version.php
+++ b/blocks/selfcompletion/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage selfcompletion
+ * @package    block_selfcompletion
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/settings/block_settings.php b/blocks/settings/block_settings.php
index 7540a724c9e..499dc858c3e 100644
--- a/blocks/settings/block_settings.php
+++ b/blocks/settings/block_settings.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -20,7 +19,7 @@
  * and was introduced as part of the changes occuring in Moodle 2.0
  *
  * @since 2.0
- * @package blocks
+ * @package block_settings
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -30,7 +29,7 @@
  *
  * Used to produce the settings navigation block new to Moodle 2.0
  *
- * @package blocks
+ * @package block_settings
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/settings/db/upgrade.php b/blocks/settings/db/upgrade.php
index e06f9bbb51c..2e27da6b4b5 100644
--- a/blocks/settings/db/upgrade.php
+++ b/blocks/settings/db/upgrade.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -33,7 +32,7 @@
  * before any action that may take longer time to finish.
  *
  * @since 2.0
- * @package blocks
+ * @package block_settings
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/settings/edit_form.php b/blocks/settings/edit_form.php
index e9af212285d..12683c7fe75 100644
--- a/blocks/settings/edit_form.php
+++ b/blocks/settings/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -19,7 +18,7 @@
  * Form for editing settings navigation instances.
  *
  * @since 2.0
- * @package blocks
+ * @package block_settings
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -27,7 +26,7 @@
 /**
  * Form for setting navigation instances.
  *
- * @package blocks
+ * @package block_settings
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/settings/lang/en/block_settings.php b/blocks/settings/lang/en/block_settings.php
index 7442de84611..18c374b0012 100644
--- a/blocks/settings/lang/en/block_settings.php
+++ b/blocks/settings/lang/en/block_settings.php
@@ -19,7 +19,7 @@
  * This file contains language strings used in the settings navigation block
  *
  * @since 2.0
- * @package blocks
+ * @package block_settings
  * @copyright 2009 Sam Hemelryk
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/settings/renderer.php b/blocks/settings/renderer.php
index a15d6e961df..5f370bb8b56 100644
--- a/blocks/settings/renderer.php
+++ b/blocks/settings/renderer.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Settings block
+ *
+ * @package    block_settings
+ * @copyright  2010 Sam Hemelryk
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_settings_renderer extends plugin_renderer_base {
 
diff --git a/blocks/settings/version.php b/blocks/settings/version.php
index a2ded17043c..1f5e76e9f53 100644
--- a/blocks/settings/version.php
+++ b/blocks/settings/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage settings
+ * @package    block_settings
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/site_main_menu/block_site_main_menu.php b/blocks/site_main_menu/block_site_main_menu.php
index e829a25cfc1..97f2ca88762 100644
--- a/blocks/site_main_menu/block_site_main_menu.php
+++ b/blocks/site_main_menu/block_site_main_menu.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Site main menu block.
+ *
+ * @package    block_site_main_menu
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_site_main_menu extends block_list {
     function init() {
diff --git a/blocks/site_main_menu/version.php b/blocks/site_main_menu/version.php
index ed6218417f5..bf3072b23df 100644
--- a/blocks/site_main_menu/version.php
+++ b/blocks/site_main_menu/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage site_main_menu
+ * @package    block_site_main_menu
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/social_activities/block_social_activities.php b/blocks/social_activities/block_social_activities.php
index e7fce57060a..5e127d8644c 100644
--- a/blocks/social_activities/block_social_activities.php
+++ b/blocks/social_activities/block_social_activities.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Social activities block.
+ *
+ * @package    block_social_activities
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_social_activities extends block_list {
     function init(){
diff --git a/blocks/social_activities/lang/en/block_social_activities.php b/blocks/social_activities/lang/en/block_social_activities.php
index 8c2e0c054b2..c8a467ac36f 100644
--- a/blocks/social_activities/lang/en/block_social_activities.php
+++ b/blocks/social_activities/lang/en/block_social_activities.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/social_activities/version.php b/blocks/social_activities/version.php
index 7705c4ee0e7..a1615ff3468 100644
--- a/blocks/social_activities/version.php
+++ b/blocks/social_activities/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage social_activities
+ * @package    block_social_activities
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/tag_flickr/block_tag_flickr.php b/blocks/tag_flickr/block_tag_flickr.php
index 93ca5462f33..56c1e606567 100644
--- a/blocks/tag_flickr/block_tag_flickr.php
+++ b/blocks/tag_flickr/block_tag_flickr.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Flickr tag block.
+ *
+ * @package    block_tag_flickr
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 define('FLICKR_DEV_KEY', '4fddbdd7ff2376beec54d7f6afad425e');
 define('DEFAULT_NUMBER_OF_PHOTOS', 6);
diff --git a/blocks/tag_flickr/edit_form.php b/blocks/tag_flickr/edit_form.php
index cf28471ace0..e67e039a7a2 100644
--- a/blocks/tag_flickr/edit_form.php
+++ b/blocks/tag_flickr/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * Form for editing tag_flickr block instances.
  *
- * @package   moodlecore
+ * @package    block_tag_flickr
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/tag_flickr/lang/en/block_tag_flickr.php b/blocks/tag_flickr/lang/en/block_tag_flickr.php
index 999b8eee036..1057087991a 100644
--- a/blocks/tag_flickr/lang/en/block_tag_flickr.php
+++ b/blocks/tag_flickr/lang/en/block_tag_flickr.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/tag_flickr/version.php b/blocks/tag_flickr/version.php
index 70cf0dd3eea..e437f3422e7 100644
--- a/blocks/tag_flickr/version.php
+++ b/blocks/tag_flickr/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage tag_flickr
+ * @package    block_tag_flickr
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/tag_youtube/block_tag_youtube.php b/blocks/tag_youtube/block_tag_youtube.php
index 139298bafe0..3779d42815c 100644
--- a/blocks/tag_youtube/block_tag_youtube.php
+++ b/blocks/tag_youtube/block_tag_youtube.php
@@ -1,4 +1,26 @@
 <?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Tag youtube block
+ *
+ * @package    block_tag_youtube
+ * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 define('DEFAULT_NUMBER_OF_VIDEOS', 5);
 
diff --git a/blocks/tag_youtube/edit_form.php b/blocks/tag_youtube/edit_form.php
index ced5b86c39f..92b54d9348c 100644
--- a/blocks/tag_youtube/edit_form.php
+++ b/blocks/tag_youtube/edit_form.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
@@ -18,7 +17,7 @@
 /**
  * Form for editing tag_youtube block instances.
  *
- * @package   moodlecore
+ * @package    block_tag_youtube
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/tag_youtube/lang/en/block_tag_youtube.php b/blocks/tag_youtube/lang/en/block_tag_youtube.php
index 03818ffe381..2f3cec16795 100644
--- a/blocks/tag_youtube/lang/en/block_tag_youtube.php
+++ b/blocks/tag_youtube/lang/en/block_tag_youtube.php
@@ -1,5 +1,4 @@
 <?php
-
 // This file is part of Moodle - http://moodle.org/
 //
 // Moodle is free software: you can redistribute it and/or modify
diff --git a/blocks/tag_youtube/version.php b/blocks/tag_youtube/version.php
index 8a2a357381b..fa792e99b2d 100644
--- a/blocks/tag_youtube/version.php
+++ b/blocks/tag_youtube/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage tag_youtube
+ * @package    block_tag_youtube
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/tags/block_tags.php b/blocks/tags/block_tags.php
index d1a037117d8..66a4be8fa4c 100644
--- a/blocks/tags/block_tags.php
+++ b/blocks/tags/block_tags.php
@@ -14,6 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+/**
+ * Tags block.
+ *
+ * @package   block_tags
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class block_tags extends block_base {
     public function init() {
diff --git a/blocks/tags/edit_form.php b/blocks/tags/edit_form.php
index e6bde82e9e7..b1b2acfbfc2 100644
--- a/blocks/tags/edit_form.php
+++ b/blocks/tags/edit_form.php
@@ -17,7 +17,7 @@
 /**
  * Form for editing tag block instances.
  *
- * @package   moodlecore
+ * @package   block_tags
  * @copyright 2009 Tim Hunt
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/blocks/tags/settings.php b/blocks/tags/settings.php
index d5d84f8f0c3..4db50986f56 100644
--- a/blocks/tags/settings.php
+++ b/blocks/tags/settings.php
@@ -14,6 +14,14 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+/**
+ * Settings for the tags block.
+ *
+ * @package   block_tags
+ * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
 defined('MOODLE_INTERNAL') || die;
 
 if ($ADMIN->fulltree) {
diff --git a/blocks/tags/version.php b/blocks/tags/version.php
index d4cf4c40c7b..b8d4eaebcbc 100644
--- a/blocks/tags/version.php
+++ b/blocks/tags/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    block
- * @subpackage tags
+ * @package    block_tags
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */