diff --git a/lib/dtl/database_exporter.php b/lib/dtl/database_exporter.php
index 34789ab5a0b2b..cf35c0a3c0b75 100644
--- a/lib/dtl/database_exporter.php
+++ b/lib/dtl/database_exporter.php
@@ -1,10 +1,28 @@
-<?php  //$Id$
+<?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/>.
+
 
 /**
- * General database import classes
- * @author Andrei Bautu
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package dbtransfer
+ * General database export class
+ *
+ * @package    moodlecore
+ * @subpackage DTL
+ * @copyright  2008 Andrei Bautu
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
diff --git a/lib/dtl/database_importer.php b/lib/dtl/database_importer.php
index 7d1b8bf4dc8aa..13a1424981eec 100644
--- a/lib/dtl/database_importer.php
+++ b/lib/dtl/database_importer.php
@@ -1,10 +1,28 @@
-<?php  //$Id$
+<?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/>.
+
 
 /**
- * General database import classes
- * @author Andrei Bautu
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package dbtransfer
+ * General database importer class
+ *
+ * @package    moodlecore
+ * @subpackage DTL
+ * @copyright  2008 Andrei Bautu
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
 /**
diff --git a/lib/dtl/database_mover.php b/lib/dtl/database_mover.php
index 3856a520fdc52..dfe01e11b4133 100644
--- a/lib/dtl/database_mover.php
+++ b/lib/dtl/database_mover.php
@@ -1,4 +1,29 @@
-<?php  //$Id$
+<?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/>.
+
+
+/**
+ * General database mover class
+ *
+ * @package    moodlecore
+ * @subpackage DTL
+ * @copyright  2008 Andrei Bautu
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 class database_mover extends database_exporter {
     /** Importer object used to transfer data. */
diff --git a/lib/dtl/file_xml_database_exporter.php b/lib/dtl/file_xml_database_exporter.php
index e0f5c3e268a63..a3adbc76a39fe 100644
--- a/lib/dtl/file_xml_database_exporter.php
+++ b/lib/dtl/file_xml_database_exporter.php
@@ -1,4 +1,29 @@
-<?php  //$Id$
+<?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/>.
+
+
+/**
+ * XML format exporter class to file storage
+ *
+ * @package    moodlecore
+ * @subpackage DTL
+ * @copyright  2008 Andrei Bautu
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 /**
  * XML format exporter class to file storage.
diff --git a/lib/dtl/file_xml_database_importer.php b/lib/dtl/file_xml_database_importer.php
index 5a0ef0f22c9d6..3f15746b86df9 100644
--- a/lib/dtl/file_xml_database_importer.php
+++ b/lib/dtl/file_xml_database_importer.php
@@ -1,4 +1,29 @@
-<?php  //$Id$
+<?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/>.
+
+
+/**
+ * XML format importer class from file storage
+ *
+ * @package    moodlecore
+ * @subpackage DTL
+ * @copyright  2008 Andrei Bautu
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 /**
  * XML format importer class from file storage.
diff --git a/lib/dtl/string_xml_database_exporter.php b/lib/dtl/string_xml_database_exporter.php
index 3bc9e8e641efe..5b0dff29d9b76 100644
--- a/lib/dtl/string_xml_database_exporter.php
+++ b/lib/dtl/string_xml_database_exporter.php
@@ -1,4 +1,29 @@
-<?php  //$Id$
+<?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/>.
+
+
+/**
+ * XML format exporter class to memory storage
+ *
+ * @package    moodlecore
+ * @subpackage DTL
+ * @copyright  2008 Andrei Bautu
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 /**
  * XML format exporter class to memory storage (i.e. a string).
diff --git a/lib/dtl/string_xml_database_importer.php b/lib/dtl/string_xml_database_importer.php
index 42e8a1391b585..679b10a08c189 100644
--- a/lib/dtl/string_xml_database_importer.php
+++ b/lib/dtl/string_xml_database_importer.php
@@ -1,4 +1,29 @@
-<?php  //$Id$
+<?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/>.
+
+
+/**
+ * XML format importer class from memory storage
+ *
+ * @package    moodlecore
+ * @subpackage DTL
+ * @copyright  2008 Andrei Bautu
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 /**
  * XML format importer class from memory storage (i.e. string).
diff --git a/lib/dtl/xml_database_exporter.php b/lib/dtl/xml_database_exporter.php
index e58e3391a647a..26d493517973a 100644
--- a/lib/dtl/xml_database_exporter.php
+++ b/lib/dtl/xml_database_exporter.php
@@ -1,4 +1,29 @@
-<?php  //$Id$
+<?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/>.
+
+
+/**
+ * XML format exporter class
+ *
+ * @package    moodlecore
+ * @subpackage DTL
+ * @copyright  2008 Andrei Bautu
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 /**
  * XML format exporter class.
diff --git a/lib/dtl/xml_database_importer.php b/lib/dtl/xml_database_importer.php
index 4f4e9c6f56700..8506d973337b8 100644
--- a/lib/dtl/xml_database_importer.php
+++ b/lib/dtl/xml_database_importer.php
@@ -1,4 +1,29 @@
-<?php  //$Id$
+<?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/>.
+
+
+/**
+ * XML format importer class
+ *
+ * @package    moodlecore
+ * @subpackage DTL
+ * @copyright  2008 Andrei Bautu
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
 
 /**
  * XML format importer class (uses SAX for speed and low memory footprint).
diff --git a/lib/dtllib.php b/lib/dtllib.php
index 507b0d7af7fdc..486508516cd49 100644
--- a/lib/dtllib.php
+++ b/lib/dtllib.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,49 +11,47 @@
 // 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/>.
 
+
 /**
  * DTL == Dtatabase Transfer Library
  *
  * This library includes all the required functions used to handle
  * transfer of data from one database to another.
- * 
- * @copyright 2008 onwards Andrei Bautu 
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package   moodlecore
+ *
+ * @package    moodlecore
+ * @subpackage DTL
+ * @copyright  2008 Andrei Bautu
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
 
- /** Require {@link ddllib.php} */
+// Require {@link ddllib.php}
 require_once($CFG->libdir.'/ddllib.php');
-/** Require {@link database_exporter.php} */
+// Require {@link database_exporter.php}
 require_once($CFG->libdir.'/dtl/database_exporter.php');
-/** Require {@link xml_database_exporter.php} */
+// Require {@link xml_database_exporter.php}
 require_once($CFG->libdir.'/dtl/xml_database_exporter.php');
-/** Require {@link file_xml_database_exporter.php} */
+// Require {@link file_xml_database_exporter.php}
 require_once($CFG->libdir.'/dtl/file_xml_database_exporter.php');
-/** Require {@link string_xml_database_exporter.php} */
+// Require {@link string_xml_database_exporter.php}
 require_once($CFG->libdir.'/dtl/string_xml_database_exporter.php');
-/** Require {@link database_mover.php} */
+// Require {@link database_mover.php}
 require_once($CFG->libdir.'/dtl/database_mover.php');
-/** Require {@link database_importer.php} */
+// Require {@link database_importer.php}
 require_once($CFG->libdir.'/dtl/database_importer.php');
-/** Require {@link xml_database_importer.php} */
+// Require {@link xml_database_importer.php}
 require_once($CFG->libdir.'/dtl/xml_database_importer.php');
-/** Require {@link file_xml_database_importer.php} */
+// Require {@link file_xml_database_importer.php}
 require_once($CFG->libdir.'/dtl/file_xml_database_importer.php');
-/** Require {@link string_xml_database_importer.php} */
+// Require {@link string_xml_database_importer.php}
 require_once($CFG->libdir.'/dtl/string_xml_database_importer.php');
 
 /**
  * Exception class for db transfer
  * @see moodle_exception
- *
- * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
- * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- * @package moodlecore
  */
 class dbtransfer_exception extends moodle_exception {
     /**