diff --git a/admin/xmldb/actions/XMLDBCheckAction.class.php b/admin/xmldb/actions/XMLDBCheckAction.class.php
index 0cf5aa31846..dcbe283ce54 100644
--- a/admin/xmldb/actions/XMLDBCheckAction.class.php
+++ b/admin/xmldb/actions/XMLDBCheckAction.class.php
@@ -197,7 +197,7 @@ abstract class XMLDBCheckAction extends XMLDBAction {
      * @return array an array with two elements: First, some additional progress output,
      *      for example a list (<ul>) of the things check each with an one work ok/not ok summary.
      *      Second, an array giving the details of any problems found. These arrays
-     *      for all tables will be aggregated, and then passed to 
+     *      for all tables will be aggregated, and then passed to
      */
     abstract protected function check_table(xmldb_table $xmldb_table, array $metacolumns);
 
diff --git a/lib/adodb/readme_moodle.txt b/lib/adodb/readme_moodle.txt
index c4a38e7fe2c..9ad90c1e3d8 100644
--- a/lib/adodb/readme_moodle.txt
+++ b/lib/adodb/readme_moodle.txt
@@ -25,5 +25,3 @@ Our changes: /// Look for "moodle" in adodb code
        we'll return to their official distro.
 
 skodak, iarenaza, moodler, stronk7
-
-$Id$
diff --git a/lib/ajax/ajaxcourse.js b/lib/ajax/ajaxcourse.js
index d8fec5fb8b8..489da2c95f5 100644
--- a/lib/ajax/ajaxcourse.js
+++ b/lib/ajax/ajaxcourse.js
@@ -1,7 +1,5 @@
 /**
  * Contains Main class and supporting functions for ajax course layout
- *
- * $Id$
  */
 
 
diff --git a/lib/ajax/block_classes.js b/lib/ajax/block_classes.js
index defcde7ef5e..9c5e373a9b3 100644
--- a/lib/ajax/block_classes.js
+++ b/lib/ajax/block_classes.js
@@ -2,8 +2,6 @@
  * library for ajaxcourse formats, the classes and related functions for drag and drop blocks
  * 
  * this library requires a 'main' object created in calling document
- *
- * $Id$ 
  */
 
 
diff --git a/lib/ajax/section_classes.js b/lib/ajax/section_classes.js
index 8d61e47c1e3..d8df2699769 100755
--- a/lib/ajax/section_classes.js
+++ b/lib/ajax/section_classes.js
@@ -11,8 +11,6 @@
  *
  *   Dropping an activity or resource on another activity or resource will
  *   always move the former just above the latter.
- *
- * $Id$
  */
 
 
diff --git a/lib/form/button.php b/lib/form/button.php
index 0a239f1c140..adc5a0f73ec 100644
--- a/lib/form/button.php
+++ b/lib/form/button.php
@@ -16,8 +16,6 @@
 // | Authors: Adam Daniel <adaniel1@eesus.jnj.com>                        |
 // |          Bertrand Mansion <bmansion@mamasam.com>                     |
 // +----------------------------------------------------------------------+
-//
-// $Id$
 
 require_once("HTML/QuickForm/button.php");
 
diff --git a/lib/form/selectgroups.php b/lib/form/selectgroups.php
index afc760204de..04420b1a7f8 100644
--- a/lib/form/selectgroups.php
+++ b/lib/form/selectgroups.php
@@ -16,8 +16,6 @@
 // | Authors: Adam Daniel <adaniel1@eesus.jnj.com>                        |
 // |          Bertrand Mansion <bmansion@mamasam.com>                     |
 // +----------------------------------------------------------------------+
-//
-// $Id$
 
 require_once('HTML/QuickForm/element.php');
 
diff --git a/lib/simpletest/broken_testfilelib.php b/lib/simpletest/broken_testfilelib.php
index 70166d1fb1a..f2d3fdf5b20 100644
--- a/lib/simpletest/broken_testfilelib.php
+++ b/lib/simpletest/broken_testfilelib.php
@@ -1,4 +1,4 @@
-<?php  // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -61,21 +61,21 @@ class filelib_test extends UnitTestCaseUsingDatabase {
 
         global $DB, $CFG;
         // Insert needed capabilities
-        $DB->insert_record('capabilities', 
+        $DB->insert_record('capabilities',
             array('id' => 45, 'name' => 'moodle/course:update', 'cattype' => 'write', 'contextlevel' => 50, 'component' => 'moodle', 'riskbitmask' => 4));
-        $DB->insert_record('capabilities', 
+        $DB->insert_record('capabilities',
             array('id' => 14, 'name' => 'moodle/site:backup', 'cattype' => 'write', 'contextlevel' => 50, 'component' => 'moodle', 'riskbitmask' => 28));
-        $DB->insert_record('capabilities', 
+        $DB->insert_record('capabilities',
             array('id' => 17, 'name' => 'moodle/site:restore', 'cattype' => 'write', 'contextlevel' => 50, 'component' => 'moodle', 'riskbitmask' => 28));
-        $DB->insert_record('capabilities', 
+        $DB->insert_record('capabilities',
             array('id' => 52, 'name' => 'moodle/course:managefiles', 'cattype' => 'write', 'contextlevel' => 50, 'component' => 'moodle', 'riskbitmask' => 4));
-        $DB->insert_record('capabilities', 
+        $DB->insert_record('capabilities',
             array('id' => 73, 'name' => 'moodle/user:editownprofile', 'cattype' => 'write', 'contextlevel' => 10, 'component' => 'moodle', 'riskbitmask' => 16));
-        
+
         // Insert system context
         $DB->insert_record('context', array('id' => 1, 'contextlevel' => 10, 'instanceid' => 0, 'path' => '/1', 'depth' => 1));
         $DB->insert_record('context', array('id' => 2, 'contextlevel' => 50, 'instanceid' => 1, 'path' => '/1/2', 'depth' => 2));
-        
+
         // Insert site course
         $DB->insert_record('course', array('category' => 0, 'sortorder' => 1, 'fullname' => 'Test site', 'shortname' => 'test', 'format' => 'site', 'modinfo' => 'a:0:{}'));
 
@@ -87,7 +87,7 @@ class filelib_test extends UnitTestCaseUsingDatabase {
         assign_capability('moodle/site:doanything', CAP_ALLOW, $adminrole, $syscontext->id);
         update_capabilities('moodle');
         update_capabilities('mod_forum');
-        
+
         $contexts = $this->load_test_data('context',
                 array('contextlevel', 'instanceid', 'path', 'depth'), array(
            1 => array(40, 666, '', 2)));
@@ -102,7 +102,7 @@ class filelib_test extends UnitTestCaseUsingDatabase {
 
         $this->switch_global_user_id(1);
         accesslib_clear_all_caches_for_unit_testing();
-        
+
         // Create a coursecat
         $newcategory = new stdClass();
         $newcategory->name = 'test category';
@@ -117,9 +117,9 @@ class filelib_test extends UnitTestCaseUsingDatabase {
         // Create a course
         $coursedata = new stdClass();
         $coursedata->category = $newcategory->id;
-        $coursedata->shortname = 'testcourse'; 
+        $coursedata->shortname = 'testcourse';
         $coursedata->fullname = 'Test Course';
-        
+
         try {
             $this->course = create_course($coursedata);
         } catch (moodle_exception $e) {
@@ -145,7 +145,7 @@ class filelib_test extends UnitTestCaseUsingDatabase {
         $module->type = 'general';
         $module->forcesubscribe = 1;
         $module->format = 1;
-        $module->name = 'Test Forum'; 
+        $module->name = 'Test Forum';
         $module->module = $DB->get_field('modules', 'id', array('name' => 'forum'));
         $module->modulename = 'forum';
         $module->add = 'forum';
@@ -153,7 +153,7 @@ class filelib_test extends UnitTestCaseUsingDatabase {
         $module->course = $this->course->id;
 
         $module->instance = forum_add_instance($module, '');
-        
+
         $this->section = get_course_section(1, $this->course->id);
         $module->section = $this->section->id;
         $module->coursemodule = add_course_module($module);
@@ -169,11 +169,11 @@ class filelib_test extends UnitTestCaseUsingDatabase {
         // Update local copy of course
         $this->course = $DB->get_record('course', array('id' => $this->course->id));
     }
-    
+
     public function teardown() {
         parent::tearDown();
     }
-    
+
     public function createFiles() {
 
     }
@@ -293,7 +293,7 @@ class test_file_info_coursecat extends filelib_test {
     public function test_get_children() {
         $children = $this->fileinfo->get_children();
         $this->assertEqual(2, count($children));
-        
+
         // Not sure but I think there should be two children: a file_info_stored object and a file_info_course object.
         $this->assertEqual('Category introduction', $children[0]->get_visible_name());
         $this->assertEqual('', $children[0]->get_url());
@@ -308,7 +308,7 @@ class test_file_info_coursecat extends filelib_test {
         $context = get_context_instance(CONTEXT_SYSTEM);
         $fis = new file_info_system(new file_browser(), $context);
         $parent = $this->fileinfo->get_parent();
-        $this->assertEqual($parent, $fis); 
+        $this->assertEqual($parent, $fis);
     }
 }
 
@@ -338,7 +338,7 @@ class test_file_info_course extends filelib_test {
         $this->assertEqual('Backups', $children[2]->get_visible_name());
         $this->assertEqual('', $children[2]->get_url());
         $this->assertEqual('file_info_stored', get_class($children[2]));
-        
+
         $this->assertEqual('Course files', $children[3]->get_visible_name());
         $this->assertEqual('', $children[3]->get_url());
         $this->assertEqual('file_info_coursefile', get_class($children[3]));
@@ -349,7 +349,7 @@ class test_file_info_course extends filelib_test {
         $context = get_context_instance(CONTEXT_COURSECAT, $this->coursecat->id);
         $fic = new file_info_coursecat(new file_browser(), $context, $this->coursecat);
         $parent = $this->fileinfo->get_parent();
-        $this->assertEqual($parent, $fic); 
+        $this->assertEqual($parent, $fic);
     }
 }
 
@@ -361,22 +361,22 @@ class test_file_info_user extends filelib_test {
         $context = get_context_instance(CONTEXT_USER, $this->user->id);
         $this->fileinfo = new file_info_user(new file_browser(), $context, $this->user);
     }
-    
+
     public function test_get_parent() {
         $context = get_context_instance(CONTEXT_SYSTEM);
         $fic = new file_info_system(new file_browser(), $context);
         $parent = $this->fileinfo->get_parent();
-        $this->assertEqual($parent, $fic); 
+        $this->assertEqual($parent, $fic);
     }
-    
+
     public function test_get_children() {
         $children = $this->fileinfo->get_children();
         $this->assertEqual(2, count($children));
-        
+
         $this->assertEqual('Personal', $children[0]->get_visible_name());
         $this->assertEqual('', $children[0]->get_url());
         $this->assertEqual('file_info_stored', get_class($children[0]));
-        
+
         $this->assertEqual('Profile', $children[1]->get_visible_name());
         $this->assertEqual('', $children[1]->get_url());
         $this->assertEqual('file_info_stored', get_class($children[1]));
@@ -397,9 +397,9 @@ class test_file_info_module extends filelib_test {
         $context = get_context_instance(CONTEXT_COURSE, $this->course->id);
         $fic = new file_info_course(new file_browser(), $context, $this->course);
         $parent = $this->fileinfo->get_parent();
-        $this->assertEqual($parent, $fic); 
+        $this->assertEqual($parent, $fic);
     }
-    
+
     public function test_get_children() {
         $children = $this->fileinfo->get_children();
         $this->assertEqual(0, count($children));
diff --git a/lib/simpletest/completion.manualtest.txt b/lib/simpletest/completion.manualtest.txt
index 198bb5ddec7..ee9319154f7 100644
--- a/lib/simpletest/completion.manualtest.txt
+++ b/lib/simpletest/completion.manualtest.txt
@@ -1,7 +1,7 @@
 Completion system manual test
 =============================
 
-This text file describes a manual process which can be used to check that the 
+This text file describes a manual process which can be used to check that the
 completion system is working correctly. This does not exercise every possible
 element of the completion system but it covers most of the basic parts.
 
@@ -14,7 +14,7 @@ CHECK A: There is no error when installing the completion database tables.
 
 2) Create users 'admin' (as part of install) and 'u1'
 3) Set the server debug to 'Developer' so that you spot any warnings etc.
-4) Create course 'CF101' (leave default except pick separate groups) and 
+4) Create course 'CF101' (leave default except pick separate groups) and
    assign 'u1' as student
 
 
@@ -32,11 +32,11 @@ Course setup
    admin screens and make sure that 'Student' is included on the list of graded
    roles, or there will be an error at this step.]
 7) Create 2 groups on the course. Assign u1 to one group.
-   
+
 Completion settings
 -------------------
 
-1) Visit the course setting screen. 
+1) Visit the course setting screen.
 
 CHECK B: The completion controls appear. Completion is enabled.
 
@@ -48,12 +48,12 @@ CHECK C: The enablecompletion setting appears. Completion is enabled.
 4) Turn off this setting and save.
 
 4b) Note: At present I have not found a satisfactory way to set a default
-  for the config option, so if necessary, please manually tick the 'Student' 
-  checkbox while on this screen. 
+  for the config option, so if necessary, please manually tick the 'Student'
+  checkbox while on this screen.
 
 5) Visit the course setting screen again.
 
-CHECK D: The completion controls do not appear.  
+CHECK D: The completion controls do not appear.
 
 6) Visit the setting screen for 'w'
 
@@ -75,26 +75,26 @@ CHECK G: Completion controls appear. Completion is set to manual.
 Completion actions
 ------------------
 
-Note: Icons are subject to change, so references to a 'tick' etc might not be 
+Note: Icons are subject to change, so references to a 'tick' etc might not be
 correct.
 
 1) Log in as u1 and go to CF101.
 
-CHECK H: A completion tick (unticked) is visible next to 'w'. 
+CHECK H: A completion tick (unticked) is visible next to 'w'.
 
 2) Click the completion mark a few times.
 
 CHECK I: Completion toggles successfully.
 
-  2b) Go to u1's profile settings and turn on/off AJAX then repeat toggling the 
+  2b) Go to u1's profile settings and turn on/off AJAX then repeat toggling the
       mark. Leave it ticked.
   CHECK I2: Completion still toggles successfully.
 
 3) Visit 'f1' and post 1 message. Return to course home.
 
-CHECK J: There is no tickmark next to f1. (If examined carefully, the 'not 
+CHECK J: There is no tickmark next to f1. (If examined carefully, the 'not
   complete' icon should be present.)
-  
+
 4) Visit 'f1' and post a reply to the message. Return to course home.
 
 CHECK K: There is now a tick next to f1.
@@ -103,9 +103,9 @@ CHECK K: There is now a tick next to f1.
 
 CHECK L: There is now a tick next to f2.
 
-6) Visit 'q1' and attempt the quiz, getting it wrong and submitting answer. 
+6) Visit 'q1' and attempt the quiz, getting it wrong and submitting answer.
   Return to the home page.
-  
+
 CHECK M: There is a black 'completed' tick next to q1.
 
 7) Visit 'q1' again and this time get it right. Return to home page.
@@ -131,24 +131,24 @@ CHECK Q: A 'completion progress' link appears.
 
 3) Click on the completion progress link.
 
-CHECK R: 
+CHECK R:
   A groups dropdown should show the two groups (and 'all').
   The progress table should include all activities for which completion
     was set, across the top.
-  The progress table should show u1 down the side.  
+  The progress table should show u1 down the side.
   Tick and X icons should match those shown when logged in as u1.
-  
+
 4) Choose a group that does not include u1
 
 CHECK S:
-  An informational ('no users') message should display instead of the progress 
+  An informational ('no users') message should display instead of the progress
   table.
-  
-5) Choose the group that does include u1   
-  
+
+5) Choose the group that does include u1
+
 CHECK T:
   The progress table should show u1 again.
-  
+
 Backup/restore
 --------------
 
@@ -161,7 +161,7 @@ Backup/restore
 
 CHECK U:
   Completion should appear as it did in the previous version of the course
-  ('w','f1','f2' complete, 'q2' complete-fail) except that q1 should show as 
+  ('w','f1','f2' complete, 'q2' complete-fail) except that q1 should show as
   incomplete.
- 
+
 
diff --git a/lib/simpletest/disabled_testeventslib.php b/lib/simpletest/disabled_testeventslib.php
index 3bcc36d9a1a..7632ed12944 100755
--- a/lib/simpletest/disabled_testeventslib.php
+++ b/lib/simpletest/disabled_testeventslib.php
@@ -1,7 +1,5 @@
 <?php
 
-/* $Id$ */
-
 if (!defined('MOODLE_INTERNAL')) {
     die('Direct access to this script is forbidden.');    ///  It must be included from a Moodle page
 }
@@ -200,4 +198,4 @@ class eventslib_test extends UnitTestCase {
 
 }
 
-?>
+
diff --git a/lib/simpletest/filtersettingsperformancetester.php b/lib/simpletest/filtersettingsperformancetester.php
index 149b7a91af8..87e35fca753 100644
--- a/lib/simpletest/filtersettingsperformancetester.php
+++ b/lib/simpletest/filtersettingsperformancetester.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
diff --git a/lib/simpletest/fixtures/events.php b/lib/simpletest/fixtures/events.php
index 333ee582b6a..cdf98b68764 100644
--- a/lib/simpletest/fixtures/events.php
+++ b/lib/simpletest/fixtures/events.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -38,4 +38,4 @@ $handlers = array (
     )
 );
 
-?>
+
diff --git a/lib/simpletest/fixtures/gradetest.php b/lib/simpletest/fixtures/gradetest.php
index 259efb67d83..ee36212ed0c 100644
--- a/lib/simpletest/fixtures/gradetest.php
+++ b/lib/simpletest/fixtures/gradetest.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -901,4 +901,4 @@ class grade_test extends FakeDBUnitTestCase {
 
 }
 
-?>
+
diff --git a/lib/simpletest/fixtures/user_agents.php b/lib/simpletest/fixtures/user_agents.php
index b1e7b0bb531..6a4b49c2c96 100644
--- a/lib/simpletest/fixtures/user_agents.php
+++ b/lib/simpletest/fixtures/user_agents.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -25,7 +25,7 @@
 
 /**
  * An array of possible user_agent strings.
- * 
+ *
  * @TODO Complete that list using http://www.pgts.com.au/pgtsj/pgtsj0208c.html
  *       OR make this test function dynamic by pulling out strings from a server somewhere,
  *       then testing each of them against the check_browser_version function.
@@ -36,7 +36,7 @@ $user_agents = array(
         '5.5' => array('Windows 2000' => 'Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)'),
         '6.0' => array('Windows XP SP2' => 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)'),
         '7.0' => array('Windows XP SP2' => 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; YPC 3.0.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)')
-    ),  
+    ),
     'Firefox' => array(
         '1.0.6'   => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.7.10) Gecko/20050716 Firefox/1.0.6'),
         '1.5'     => array('Windows XP' => 'Mozilla/5.0 (Windows; U; Windows NT 5.1; nl; rv:1.8) Gecko/20051107 Firefox/1.5'),
@@ -54,4 +54,4 @@ $user_agents = array(
                         'Debian Linux' => 'Opera/9.01 (X11; Linux i686; U; en)')
     )
 );
-?>
+
diff --git a/lib/simpletest/getstringperformancetester.php b/lib/simpletest/getstringperformancetester.php
index c01d19bc9db..2315c64a825 100644
--- a/lib/simpletest/getstringperformancetester.php
+++ b/lib/simpletest/getstringperformancetester.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -628,4 +628,4 @@ function get_string_from_file($identifier, $langfile, $destination) {
     return $destination .'= sprintf("'. $string[$identifier] .'");';
 }
 
-?>
+
diff --git a/lib/simpletest/portfolio_testclass.php b/lib/simpletest/portfolio_testclass.php
index d101f0a61b4..40586d7d2c9 100644
--- a/lib/simpletest/portfolio_testclass.php
+++ b/lib/simpletest/portfolio_testclass.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -268,4 +268,4 @@ class portfoliolib_test extends FakeDBUnitTestCase {
         }
     }
 }
-?>
+
diff --git a/lib/simpletest/testaccesslib.php b/lib/simpletest/testaccesslib.php
index c7d483382a4..d077dee2586 100644
--- a/lib/simpletest/testaccesslib.php
+++ b/lib/simpletest/testaccesslib.php
@@ -341,10 +341,10 @@ class accesslib_test extends UnitTestCaseUsingDatabase {
                 array(      5, 'moodle/site:doanything', SYSCONTEXTID, CAP_PREVENT),
                 array(      6,     'moodle/course:view', SYSCONTEXTID, CAP_PREVENT),
                 ));
-        
+
         $this->switch_to_test_db();
 
         $this->assert(new ArraysHaveSameValuesExpectation(array(2, 5)), array_keys(get_allowed_switchable_roles()));
     }
 }
-?>
+
diff --git a/lib/simpletest/testbackuplib.php b/lib/simpletest/testbackuplib.php
index 7324d56a5ef..2d74c3e42e3 100644
--- a/lib/simpletest/testbackuplib.php
+++ b/lib/simpletest/testbackuplib.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -43,4 +43,4 @@ class backuplib_test extends UnitTestCase {
 
 }
 
-?>
+
diff --git a/lib/simpletest/testblocklib_blockmanager.php b/lib/simpletest/testblocklib_blockmanager.php
index 31ebc870eef..f9c33c1e0be 100644
--- a/lib/simpletest/testblocklib_blockmanager.php
+++ b/lib/simpletest/testblocklib_blockmanager.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -391,4 +391,4 @@ class moodle_block_manager_test_saving_loading extends UnitTestCaseUsingDatabase
         $this->assertContainsBlocksOfType(array($blockname), $blocks);
     }
 }
-?>
+
diff --git a/lib/simpletest/testcode.php b/lib/simpletest/testcode.php
index 6f7fc0da7b4..0c458fab058 100644
--- a/lib/simpletest/testcode.php
+++ b/lib/simpletest/testcode.php
@@ -47,4 +47,4 @@ class code_test extends UnitTestCase {
         }
     }
 }
-?>
+
diff --git a/lib/simpletest/testcompletionlib.php b/lib/simpletest/testcompletionlib.php
index 4f79f2566e3..747c1cadf51 100644
--- a/lib/simpletest/testcompletionlib.php
+++ b/lib/simpletest/testcompletionlib.php
@@ -92,7 +92,7 @@ class completionlib_test extends FakeDBUnitTestCase {
     public static $includecoverage = array('lib/completionlib.php');
     var $realdb,$realcfg,$realsession,$realuser;
 
-    function setUp() {        
+    function setUp() {
         global $DB,$CFG,$SESSION,$USER;
         $this->realdb=$DB;
         $this->realcfg=$CFG;
@@ -678,4 +678,4 @@ WHERE
             completion_info::internal_get_grade_state($item,$grade));
     }
 }
-?>
+
diff --git a/lib/simpletest/testconditionlib.php b/lib/simpletest/testconditionlib.php
index 0d25d7b5591..c7b45fa49d3 100644
--- a/lib/simpletest/testconditionlib.php
+++ b/lib/simpletest/testconditionlib.php
@@ -35,7 +35,7 @@ class conditionlib_test extends FakeDBUnitTestCase {
             'showavailability'=>1,'availablefrom'=>17,'availableuntil'=>398,'course'=>64));
 
         // no ID
-        try { 
+        try {
             $test=new condition_info($cm);
             $this->fail();
         } catch(coding_exception $e) {
@@ -342,4 +342,4 @@ class conditionlib_test extends FakeDBUnitTestCase {
     }
 
 }
-?>
+
diff --git a/lib/simpletest/testfilterconfig.php b/lib/simpletest/testfilterconfig.php
index bf8192f497c..ccd3592700e 100644
--- a/lib/simpletest/testfilterconfig.php
+++ b/lib/simpletest/testfilterconfig.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -659,4 +659,4 @@ class filter_filter_set_applies_to_strings extends UnitTestCaseUsingDatabase {
         $this->assertTrue($CFG->filterall);
     }
 }
-?>
+
diff --git a/lib/simpletest/testfiltermanager.php b/lib/simpletest/testfiltermanager.php
index ae79c384eaa..3979d9ab418 100644
--- a/lib/simpletest/testfiltermanager.php
+++ b/lib/simpletest/testfiltermanager.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -128,4 +128,4 @@ class killfrogs_test_filter extends moodle_text_filter {
     }
 }
 
-?>
+
diff --git a/lib/simpletest/testgradelib.php b/lib/simpletest/testgradelib.php
index da33d8d2619..60c5a8ebee5 100644
--- a/lib/simpletest/testgradelib.php
+++ b/lib/simpletest/testgradelib.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -43,4 +43,4 @@ class gradelib_test extends grade_test {
     }
 }
 
-?>
+
diff --git a/lib/simpletest/testmathslib.php b/lib/simpletest/testmathslib.php
index 80491a36ee0..ead572fee72 100755
--- a/lib/simpletest/testmathslib.php
+++ b/lib/simpletest/testmathslib.php
@@ -78,4 +78,4 @@ class mathsslib_test extends UnitTestCase {
 
 }
 
-?>
+
diff --git a/lib/simpletest/testmoodlelib.php b/lib/simpletest/testmoodlelib.php
index e81c8cd9fad..7b250d15410 100644
--- a/lib/simpletest/testmoodlelib.php
+++ b/lib/simpletest/testmoodlelib.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -371,11 +371,11 @@ class moodlelib_test extends UnitTestCase {
             "tags that ...</blockquote></p></div>", shorten_text($text));
 
         $text = "some text which shouldn't &nbsp; break there";
-        $this->assertEqual("some text which shouldn't &nbsp; ...", 
+        $this->assertEqual("some text which shouldn't &nbsp; ...",
             shorten_text($text, 31));
-        $this->assertEqual("some text which shouldn't ...", 
+        $this->assertEqual("some text which shouldn't ...",
             shorten_text($text, 30));
-        
+
         // This case caused a bug up to 1.9.5
         $text = "<h3>standard 'break-out' sub groups in TGs?</h3>&nbsp;&lt;&lt;There are several";
         $this->assertEqual("<h3>standard 'break-out' sub groups in ...</h3>",
@@ -384,4 +384,4 @@ class moodlelib_test extends UnitTestCase {
 
 }
 
-?>
+
diff --git a/lib/simpletest/testnavigationlib.php b/lib/simpletest/testnavigationlib.php
index b29e1946ec2..515aceffd56 100644
--- a/lib/simpletest/testnavigationlib.php
+++ b/lib/simpletest/testnavigationlib.php
@@ -66,7 +66,7 @@ class navigation_node_test extends UnitTestCase {
         $this->node->get('hiddendemo1')->get('hiddendemo2')->helpbutton = 'Here is a help button';
         $this->node->get('hiddendemo1')->get('hiddendemo3')->display = false;
     }
-    
+
     public function test___construct() {
         global $CFG;
         $node = new navigation_node($this->fakeproperties);
@@ -353,7 +353,7 @@ class global_navigation_test extends UnitTestCase {
     protected $coursesections5 = 'a:5:{i:0;O:8:"stdClass":6:{s:7:"section";s:1:"0";s:2:"id";s:2:"14";s:6:"course";s:1:"5";s:7:"summary";N;s:8:"sequence";s:3:"288";s:7:"visible";s:1:"1";}i:1;O:8:"stdClass":6:{s:7:"section";s:1:"1";s:2:"id";s:2:"97";s:6:"course";s:1:"5";s:7:"summary";s:0:"";s:8:"sequence";N;s:7:"visible";s:1:"1";}i:2;O:8:"stdClass":6:{s:7:"section";s:1:"2";s:2:"id";s:2:"98";s:6:"course";s:1:"5";s:7:"summary";s:0:"";s:8:"sequence";N;s:7:"visible";s:1:"1";}i:3;O:8:"stdClass":6:{s:7:"section";s:1:"3";s:2:"id";s:2:"99";s:6:"course";s:1:"5";s:7:"summary";s:0:"";s:8:"sequence";N;s:7:"visible";s:1:"1";}i:4;O:8:"stdClass":6:{s:7:"section";s:1:"4";s:2:"id";s:3:"100";s:6:"course";s:1:"5";s:7:"summary";s:0:"";s:8:"sequence";N;s:7:"visible";s:1:"1";}}';
     public static $includecoverage = array('./lib/navigationlib.php');
     public static $excludecoverage = array();
-    
+
     public function setUp() {
         $this->cache = new navigation_cache('simpletest_nav');
         $this->node = new exposed_global_navigation();
@@ -509,7 +509,7 @@ class global_navigation_test extends UnitTestCase {
             $course->modinfo = $this->modinfo5;
             $courses[$i] = $course;
         }
-        
+
         $this->node->add_courses($courses);
         $this->assertIsA($this->node->get('cat3')->get(0), 'navigation_node');
         $this->assertIsA($this->node->get('cat3')->get(1), 'navigation_node');
@@ -568,7 +568,7 @@ class global_navigation_test extends UnitTestCase {
         $course->numsections = 10;
         $course->modinfo = $this->modinfo5;
         $coursechildren = $this->node->get_by_path($keys)->children;
-        
+
         $this->node->get_by_path(array('cat2', 'sub2', '5'))->children = array();
         $this->node->exposed_load_course_sections($keys, $course);
 
@@ -717,7 +717,7 @@ class limited_global_navigation_test extends UnitTestCase {
         if ($node4->get('initcall')) {
             $this->assertEqual($node4->get('initcall')->text, 'load_for_section_4');
         }
-        
+
         $node5 = clone($this->mocknode);
         $node5->initialise(navigation_node::TYPE_RESOURCE, 5);
         $this->assertFalse($node5->get('initcall'));
diff --git a/lib/simpletest/testpagelib_moodlepage.php b/lib/simpletest/testpagelib_moodlepage.php
index de156291dda..c53e246affa 100644
--- a/lib/simpletest/testpagelib_moodlepage.php
+++ b/lib/simpletest/testpagelib_moodlepage.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -801,4 +801,4 @@ class moodle_page_editing_test extends UnitTestCase {
         $this->assert(new ArraysHaveSameValuesExpectation($expectedcaps), $actualcaps);
     }
 }
-?>
+
diff --git a/lib/simpletest/testportfolioaddbutton.php b/lib/simpletest/testportfolioaddbutton.php
index 3b8fa78367a..b7c6ba5df56 100644
--- a/lib/simpletest/testportfolioaddbutton.php
+++ b/lib/simpletest/testportfolioaddbutton.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -52,4 +52,4 @@ class portfoliolibaddbutton_test extends FakeDBUnitTestCase {
     }
 }
 
-?>
+
diff --git a/lib/simpletest/testportfoliolib.php b/lib/simpletest/testportfoliolib.php
index b76879f6557..bda31f08c71 100755
--- a/lib/simpletest/testportfoliolib.php
+++ b/lib/simpletest/testportfoliolib.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -44,4 +44,4 @@ foreach (get_list_of_plugins('mod') as $module) {
         require_once($modtest);
     }
 }
-?>
+
diff --git a/lib/simpletest/testquestionlib.php b/lib/simpletest/testquestionlib.php
index 29056ef3fd4..3c924995800 100644
--- a/lib/simpletest/testquestionlib.php
+++ b/lib/simpletest/testquestionlib.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -137,4 +137,4 @@ class questionlib_test extends UnitTestCase {
     }
 }
 
-?>
+
diff --git a/lib/simpletest/testrepositorylib.php b/lib/simpletest/testrepositorylib.php
index 9cebcb7f655..3e8b691b4d6 100644
--- a/lib/simpletest/testrepositorylib.php
+++ b/lib/simpletest/testrepositorylib.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -66,4 +66,4 @@ class repositorylib_test extends FakeDBUnitTestCase {
         }
     }
 }
-?>
+
diff --git a/lib/simpletest/testrss.php b/lib/simpletest/testrss.php
index e32b33e47a7..7f3a5005197 100644
--- a/lib/simpletest/testrss.php
+++ b/lib/simpletest/testrss.php
@@ -10,7 +10,7 @@ if (!defined('MOODLE_INTERNAL')) {
  *   rsstest.xml: One valid rss feed.
  *   md5:  8fd047914863bf9b3a4b1514ec51c32c
  *   size: 32188
- * 
+ *
  * If networking/proxy configuration is wrong these tests will fail..
  */
 
@@ -75,7 +75,7 @@ Google will pay students US$100 for every three tasks they successfully complete
 <br />
 You can find out all the details on the <a href="http://code.google.com/p/google-highly-open-participation-moodle/">Moodle/GHOP contest site</a>.</p></p>
 EOD;
-        $this->assertEqual($itemone->get_description(), $description); 
+        $this->assertEqual($itemone->get_description(), $description);
 
 
         // TODO fix this so it uses $CFG by default
diff --git a/lib/simpletest/testsimpletestlib.php b/lib/simpletest/testsimpletestlib.php
index 50791bccb86..ea4379a4499 100644
--- a/lib/simpletest/testsimpletestlib.php
+++ b/lib/simpletest/testsimpletestlib.php
@@ -96,4 +96,4 @@ class ContainsTagWithContents_test extends UnitTestCase {
     }
 }
 
-?>
+
diff --git a/lib/simpletest/teststringmanager.php b/lib/simpletest/teststringmanager.php
index 9f8301e40a9..8dd7f563ac1 100644
--- a/lib/simpletest/teststringmanager.php
+++ b/lib/simpletest/teststringmanager.php
@@ -1,4 +1,4 @@
-<?php // $Id$
+<?php
 
 ///////////////////////////////////////////////////////////////////////////
 //                                                                       //
@@ -467,10 +467,10 @@ class string_manager_test extends UnitTestCase {
         // Exercise SUT.
         $this->assertEqual($this->stringmanager->get_list_of_countries(),
                 array('AU' => 'Aussie', 'GB' => 'Royaume-Uni'));
-        
+
         // Tear down.
         $CFG->allcountrycodes = $oldlist;
     }
 }
 
-?>
+
diff --git a/lib/simpletest/testunittestusingdb.php b/lib/simpletest/testunittestusingdb.php
index 523ace01fac..7bc487bce51 100644
--- a/lib/simpletest/testunittestusingdb.php
+++ b/lib/simpletest/testunittestusingdb.php
@@ -30,4 +30,4 @@ class UnitTestCaseUsingDatabase_test extends UnitTestCaseUsingDatabase {
     }
 
 }
-?>
+
diff --git a/lib/simpletest/testweblib.php b/lib/simpletest/testweblib.php
index d727f618b29..94fcaf56cf6 100644
--- a/lib/simpletest/testweblib.php
+++ b/lib/simpletest/testweblib.php
@@ -116,7 +116,7 @@ class web_test extends UnitTestCase {
         $this->assertEqual("$CFG->wwwroot/admin/report/unittest/$relativeurl1", prepare_url(new moodle_url($relativeurl1)));
         $this->assertEqual("$CFG->wwwroot$relativeurl2", prepare_url(new moodle_url($relativeurl2)));
     }
-    
+
     function test_compare_url() {
         $url1 = new moodle_url('index.php', array('var1' => 1, 'var2' => 2));
         $url2 = new moodle_url('index2.php', array('var1' => 1, 'var2' => 2, 'var3' => 3));
@@ -145,4 +145,4 @@ class web_test extends UnitTestCase {
     }
 }
 
-?>
+
diff --git a/lib/simpletest/todochecker.php b/lib/simpletest/todochecker.php
index 51799f68c22..6bbbc80f29c 100644
--- a/lib/simpletest/todochecker.php
+++ b/lib/simpletest/todochecker.php
@@ -1,7 +1,7 @@
 <?php
 
-// This file is part of Moodle - http://moodle.org/ 
-// 
+// 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
@@ -11,7 +11,7 @@
 // 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/>.
 
diff --git a/mod/glossary/formats/README.txt b/mod/glossary/formats/README.txt
index 4732788a7d5..5c7633ecfa9 100644
--- a/mod/glossary/formats/README.txt
+++ b/mod/glossary/formats/README.txt
@@ -1,5 +1,3 @@
-$Id$
-
 GLOSSARY FORMAT PLUGINS
 -----------------------