diff --git a/auth/cas/auth.php b/auth/cas/auth.php
index 6b22044b22d..242e9b0188e 100644
--- a/auth/cas/auth.php
+++ b/auth/cas/auth.php
@@ -1,17 +1,29 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @author Jerome GUTIERREZ
- * @author Iñaki Arenaza
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: CAS Authentication
  *
  * Authentication using CAS (Central Authentication Server).
  *
- * 2006-08-28  File created.
+ * @author Martin Dougiamas
+ * @author Jerome GUTIERREZ
+ * @author Iñaki Arenaza
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package auth_cas
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/cas/cli/sync_users.php b/auth/cas/cli/sync_users.php
index 0369963eec0..33cf33abbce 100644
--- a/auth/cas/cli/sync_users.php
+++ b/auth/cas/cli/sync_users.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
@@ -38,8 +37,7 @@
  * We have optimized it as best as we could for PostgreSQL and MySQL, with 27K students
  * we have seen this take 10 minutes.
  *
- * @package    auth
- * @subpackage CAS
+ * @package    auth_cas
  * @copyright  2007 Jerome Gutierrez - based on code by Martin Langhoff
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/cas/lang/en/auth_cas.php b/auth/cas/lang/en/auth_cas.php
index 70a82a077ad..c30522c6d98 100644
--- a/auth/cas/lang/en/auth_cas.php
+++ b/auth/cas/lang/en/auth_cas.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/>.
 
 /**
- * Strings for component 'auth_cas', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_cas', language 'en'.
  *
  * @package   auth_cas
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/cas/version.php b/auth/cas/version.php
index 11b32ca2e67..6a225146d2f 100644
--- a/auth/cas/version.php
+++ b/auth/cas/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    auth
- * @subpackage cas
+ * @package    auth_cas
  * @author     Martin Dougiamas
  * @author     Jerome GUTIERREZ
  * @author     Iñaki Arenaza
diff --git a/auth/email/auth.php b/auth/email/auth.php
index 777fe9f1866..4c4db6d99b6 100644
--- a/auth/email/auth.php
+++ b/auth/email/auth.php
@@ -1,15 +1,25 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: Email Authentication
  *
- * Standard authentication function.
- *
- * 2006-08-28  File created.
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
+ * @package auth_email
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/email/lang/en/auth_email.php b/auth/email/lang/en/auth_email.php
index e1dbb7198c7..61045514695 100644
--- a/auth/email/lang/en/auth_email.php
+++ b/auth/email/lang/en/auth_email.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/>.
 
 /**
- * Strings for component 'auth_email', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_email', language 'en'.
  *
  * @package   auth_email
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/email/version.php b/auth/email/version.php
index e5e074d7af8..a82ce53d498 100644
--- a/auth/email/version.php
+++ b/auth/email/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    auth
- * @subpackage email
+ * @package    auth_email
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/fc/auth.php b/auth/fc/auth.php
index 73e803d3e30..cec4fcf6579 100644
--- a/auth/fc/auth.php
+++ b/auth/fc/auth.php
@@ -1,14 +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/>.
+
 /**
+ * Authentication Plugin: FirstClass Authentication
+ * Authentication using a FirstClass server.
+
+ * @package auth_fc
  * @author Martin Dougiamas
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
- * Authentication Plugin: FirstClass Authentication
- *
- * Authentication using a FirstClass server.
- *
- * 2006-08-28  File created.
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/fc/lang/en/auth_fc.php b/auth/fc/lang/en/auth_fc.php
index 7bc3498d816..46e75fcbbbc 100644
--- a/auth/fc/lang/en/auth_fc.php
+++ b/auth/fc/lang/en/auth_fc.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/>.
 
 /**
- * Strings for component 'auth_fc', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_fc', language 'en'.
  *
  * @package   auth_fc
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/fc/version.php b/auth/fc/version.php
index 0d527946029..a44ec3f6601 100644
--- a/auth/fc/version.php
+++ b/auth/fc/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    auth
- * @subpackage fc
+ * @package    auth_fc
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/imap/auth.php b/auth/imap/auth.php
index 17df433cf84..88ac98c9631 100644
--- a/auth/imap/auth.php
+++ b/auth/imap/auth.php
@@ -1,15 +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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: IMAP Authentication
- *
  * Authenticates against an IMAP server.
  *
- * 2006-08-31  File created.
+ * @package auth_imap
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/imap/lang/en/auth_imap.php b/auth/imap/lang/en/auth_imap.php
index a13b8be8b07..ccfe27b590c 100644
--- a/auth/imap/lang/en/auth_imap.php
+++ b/auth/imap/lang/en/auth_imap.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/>.
 
 /**
- * Strings for component 'auth_imap', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_imap', language 'en'.
  *
  * @package   auth_imap
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/imap/version.php b/auth/imap/version.php
index c88fe31d394..af54d8ce69b 100644
--- a/auth/imap/version.php
+++ b/auth/imap/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    auth
- * @subpackage imap
+ * @package    auth_imap
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/ldap/auth.php b/auth/ldap/auth.php
index 00f0bf9da7d..3858c7b832a 100644
--- a/auth/ldap/auth.php
+++ b/auth/ldap/auth.php
@@ -1,16 +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/>.
 
 /**
+ * Authentication Plugin: LDAP Authentication
+ * Authentication using LDAP (Lightweight Directory Access Protocol).
+ *
+ * @package auth_ldap
  * @author Martin Dougiamas
  * @author Iñaki Arenaza
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
- * Authentication Plugin: LDAP Authentication
- *
- * Authentication using LDAP (Lightweight Directory Access Protocol).
- *
- * 2006-08-28  File created.
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/ldap/cli/sync_users.php b/auth/ldap/cli/sync_users.php
index 57637cac1e7..ee155384962 100644
--- a/auth/ldap/cli/sync_users.php
+++ b/auth/ldap/cli/sync_users.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
@@ -42,8 +41,7 @@
  * We have optimized it as best as we could for PostgreSQL and MySQL, with 27K students
  * we have seen this take 10 minutes.
  *
- * @package    auth
- * @subpackage ldap
+ * @package    auth_ldap
  * @copyright  2004 Martin Langhoff
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/ldap/lang/en/auth_ldap.php b/auth/ldap/lang/en/auth_ldap.php
index 00d7015f972..54c174bc2e7 100644
--- a/auth/ldap/lang/en/auth_ldap.php
+++ b/auth/ldap/lang/en/auth_ldap.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/>.
 
 /**
- * Strings for component 'auth_ldap', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_ldap', language 'en'.
  *
  * @package   auth_ldap
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/ldap/version.php b/auth/ldap/version.php
index 40e9fb5e3ae..1b13eb83bae 100644
--- a/auth/ldap/version.php
+++ b/auth/ldap/version.php
@@ -17,8 +17,7 @@
 /**
  * Version details
  *
- * @package    auth
- * @subpackage ldap
+ * @package    auth_ldap
  * @author     Martin Dougiamas
  * @author     Iñaki Arenaza
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/auth/manual/auth.php b/auth/manual/auth.php
index 0c521e86cf6..3b4fdae5715 100644
--- a/auth/manual/auth.php
+++ b/auth/manual/auth.php
@@ -18,8 +18,7 @@
  * Authentication Plugin: Manual Authentication
  * Just does a simple check against the moodle database.
  *
- * @package    auth
- * @subpackage manual
+ * @package    auth_manual
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/manual/db/upgrade.php b/auth/manual/db/upgrade.php
index 0c37b616864..ab21ba61294 100644
--- a/auth/manual/db/upgrade.php
+++ b/auth/manual/db/upgrade.php
@@ -17,8 +17,7 @@
 /**
  * Manual authentication plugin upgrade code
  *
- * @package    auth
- * @subpackage manual
+ * @package    auth_manual
  * @copyright  2011 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/manual/lang/en/auth_manual.php b/auth/manual/lang/en/auth_manual.php
index 69f6cd0e285..53d89098a42 100644
--- a/auth/manual/lang/en/auth_manual.php
+++ b/auth/manual/lang/en/auth_manual.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/>.
 
 /**
- * Strings for component 'auth_manual', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_manual', language 'en'.
  *
  * @package   auth_manual
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/manual/version.php b/auth/manual/version.php
index ce337301615..25deabd17c7 100644
--- a/auth/manual/version.php
+++ b/auth/manual/version.php
@@ -17,8 +17,7 @@
 /**
  * Manual authentication plugin version information
  *
- * @package    auth
- * @subpackage manual
+ * @package    auth_manual
  * @copyright  2011 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/mnet/auth.php b/auth/mnet/auth.php
index 203d161db05..dd8ff48d582 100644
--- a/auth/mnet/auth.php
+++ b/auth/mnet/auth.php
@@ -1,15 +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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: Moodle Network Authentication
- *
  * Multiple host authentication support for Moodle Network.
  *
- * 2006-11-01  File created.
+ * @package auth_mnet
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/mnet/db/mnet.php b/auth/mnet/db/mnet.php
index 743f1ff0d58..8a371d3ef75 100644
--- a/auth/mnet/db/mnet.php
+++ b/auth/mnet/db/mnet.php
@@ -14,13 +14,11 @@
 // 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 mnet services for the mnet authentication plugin
  *
  * @since 2.0
- * @package moodlecore
- * @subpackage auth
+ * @package auth_mnet
  * @copyright 2010 Penny Leach
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/mnet/db/upgrade.php b/auth/mnet/db/upgrade.php
index 2f6582242c9..4147bffb632 100644
--- a/auth/mnet/db/upgrade.php
+++ b/auth/mnet/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
@@ -18,8 +17,7 @@
 /**
  * Keeps track of upgrades to the auth_mnet plugin
  *
- * @package    auth
- * @subpackage mnet
+ * @package    auth_mnet
  * @copyright  2010 David Mudrak <david@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/mnet/jump.php b/auth/mnet/jump.php
index d44d058a7e2..d72e206628f 100644
--- a/auth/mnet/jump.php
+++ b/auth/mnet/jump.php
@@ -1,15 +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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: Moodle Network Authentication
- *
  * Multiple host authentication support for Moodle Network.
  *
- * 2006-11-01  File created.
+ * @package auth_mnet
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 require_once dirname(dirname(dirname(__FILE__))) . '/config.php';
diff --git a/auth/mnet/land.php b/auth/mnet/land.php
index 1bcd01ea5e0..59adbf31ce1 100644
--- a/auth/mnet/land.php
+++ b/auth/mnet/land.php
@@ -1,15 +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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: Moodle Network Authentication
- *
  * Multiple host authentication support for Moodle Network.
  *
- * 2006-11-01  File created.
+ * @package auth_mnet
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 require_once dirname(dirname(dirname(__FILE__))) . '/config.php';
diff --git a/auth/mnet/lang/en/auth_mnet.php b/auth/mnet/lang/en/auth_mnet.php
index 915b4c2cb28..7084050c7a1 100644
--- a/auth/mnet/lang/en/auth_mnet.php
+++ b/auth/mnet/lang/en/auth_mnet.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/>.
 
 /**
- * Strings for component 'auth_mnet', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_mnet', language 'en'.
  *
  * @package   auth_mnet
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/mnet/version.php b/auth/mnet/version.php
index a091fa2391e..bc5d11838b1 100644
--- a/auth/mnet/version.php
+++ b/auth/mnet/version.php
@@ -17,8 +17,7 @@
 /**
  * Manual authentication plugin version information
  *
- * @package    auth
- * @subpackage mnet
+ * @package    auth_mnet
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/nntp/auth.php b/auth/nntp/auth.php
index 495b5055335..d08d30b45df 100644
--- a/auth/nntp/auth.php
+++ b/auth/nntp/auth.php
@@ -1,15 +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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: NNTP Authentication
- *
  * Authenticates against an NNTP server.
  *
- * 2006-08-31  File created.
+ * @package auth_nntp
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/nntp/lang/en/auth_nntp.php b/auth/nntp/lang/en/auth_nntp.php
index 096f7f7889a..fa10cacce66 100644
--- a/auth/nntp/lang/en/auth_nntp.php
+++ b/auth/nntp/lang/en/auth_nntp.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/>.
 
 /**
- * Strings for component 'auth_nntp', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_nntp', language 'en'.
  *
  * @package   auth_nntp
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/nntp/version.php b/auth/nntp/version.php
index 5a533dcb730..287537977be 100644
--- a/auth/nntp/version.php
+++ b/auth/nntp/version.php
@@ -17,8 +17,7 @@
 /**
  * Version information
  *
- * @package    auth
- * @subpackage nntp
+ * @package    auth_nntp
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/nologin/auth.php b/auth/nologin/auth.php
index 72f5fa85753..f3a4a99445d 100644
--- a/auth/nologin/auth.php
+++ b/auth/nologin/auth.php
@@ -1,15 +1,25 @@
 <?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/>.
 
 /**
+ * Nologin authentication login - prevents user login.
+ *
+ * @package auth_nologin
  * @author Petr Skoda
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
- * Authentication Plugin: No Authentication
- *
- * No authentication at all. This method approves everything!
- *
- * 2007-02-18  File created.
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/nologin/lang/en/auth_nologin.php b/auth/nologin/lang/en/auth_nologin.php
index ad4ba165dfe..edb4c7979f8 100644
--- a/auth/nologin/lang/en/auth_nologin.php
+++ b/auth/nologin/lang/en/auth_nologin.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/>.
 
 /**
- * Strings for component 'auth_nologin', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_nologin', language 'en'.
  *
  * @package   auth_nologin
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/nologin/version.php b/auth/nologin/version.php
index a9879cedaf3..2d7a06013c1 100644
--- a/auth/nologin/version.php
+++ b/auth/nologin/version.php
@@ -17,8 +17,7 @@
 /**
  * Version information
  *
- * @package    auth
- * @subpackage nologin
+ * @package    auth_nologin
  * @copyright  2011 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/none/auth.php b/auth/none/auth.php
index 00eaf04c1a7..0affa429722 100644
--- a/auth/none/auth.php
+++ b/auth/none/auth.php
@@ -1,15 +1,25 @@
 <?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/>.
 
 /**
+ * Anobody can login with any password.
+ *
+ * @package auth_none
  * @author Martin Dougiamas
  * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
- * Authentication Plugin: No Authentication
- *
- * No authentication at all. This method approves everything!
- *
- * 2006-08-31  File created.
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/none/lang/en/auth_none.php b/auth/none/lang/en/auth_none.php
index d5cf02b96bf..a65dbd56091 100644
--- a/auth/none/lang/en/auth_none.php
+++ b/auth/none/lang/en/auth_none.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/>.
 
 /**
- * Strings for component 'auth_none', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_none', language 'en'.
  *
  * @package   auth_none
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/none/version.php b/auth/none/version.php
index 80b43e1f923..de9eda6df28 100644
--- a/auth/none/version.php
+++ b/auth/none/version.php
@@ -17,8 +17,7 @@
 /**
  * Version information
  *
- * @package    auth
- * @subpackage none
+ * @package    auth_none
  * @copyright  2011 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/pam/auth.php b/auth/pam/auth.php
index c0afbe0ed81..590fff8d707 100644
--- a/auth/pam/auth.php
+++ b/auth/pam/auth.php
@@ -1,10 +1,20 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: PAM Authentication
  *
  * PAM (Pluggable Authentication Modules) for Moodle
@@ -21,9 +31,9 @@
  * Website 1: http://elearning.zhwin.ch/
  * Website 2: http://birdy1976.com/
  *
- * License:  GPL License v2
- *
- * 2006-08-31  File created.
+ * @package auth_pam
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/pam/lang/en/auth_pam.php b/auth/pam/lang/en/auth_pam.php
index 3f9fee1c8d7..f8d53759c1a 100644
--- a/auth/pam/lang/en/auth_pam.php
+++ b/auth/pam/lang/en/auth_pam.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/>.
 
 /**
- * Strings for component 'auth_pam', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_pam', language 'en'.
  *
  * @package   auth_pam
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/pam/version.php b/auth/pam/version.php
index 6c7ba3d2fa6..79e310c8a23 100644
--- a/auth/pam/version.php
+++ b/auth/pam/version.php
@@ -17,8 +17,7 @@
 /**
  * Version information
  *
- * @package    auth
- * @subpackage pam
+ * @package    auth_pam
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/pop3/auth.php b/auth/pop3/auth.php
index 8fe4f94ad8d..2d8d992f2a6 100644
--- a/auth/pop3/auth.php
+++ b/auth/pop3/auth.php
@@ -1,15 +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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: POP3 Authentication
- *
  * Authenticates against a POP3 server.
  *
- * 2006-08-31  File created.
+ * @package auth_pop3
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/pop3/lang/en/auth_pop3.php b/auth/pop3/lang/en/auth_pop3.php
index 87a05dc7a2b..4aa257a4489 100644
--- a/auth/pop3/lang/en/auth_pop3.php
+++ b/auth/pop3/lang/en/auth_pop3.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/>.
 
 /**
- * Strings for component 'auth_pop3', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_pop3', language 'en'.
  *
  * @package   auth_pop3
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/pop3/version.php b/auth/pop3/version.php
index 57b4856e4c0..fc028d2b0fa 100644
--- a/auth/pop3/version.php
+++ b/auth/pop3/version.php
@@ -17,8 +17,7 @@
 /**
  * Version information
  *
- * @package    auth
- * @subpackage pop3
+ * @package    auth_pop3
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/radius/auth.php b/auth/radius/auth.php
index 5897b01b37e..66c4a00c251 100644
--- a/auth/radius/auth.php
+++ b/auth/radius/auth.php
@@ -1,18 +1,29 @@
 <?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/>.
 
 /**
- * @author Martin Dougiamas
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: RADIUS Authentication
  *
  * Authenticates against a RADIUS server.
  * Contributed by Clive Gould <clive@ce.bromley.ac.uk>
  * CHAP support contributed by Stanislav Tsymbalov http://www.tsymbalov.net/
  *
- * 2006-08-31  File created.
- * 2008-03-12  CHAP support added by Stanislav Tsymbalov.
+ * @package auth_radius
+ * @author Martin Dougiamas
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/radius/lang/en/auth_radius.php b/auth/radius/lang/en/auth_radius.php
index fb98f3d1658..e2b08155333 100644
--- a/auth/radius/lang/en/auth_radius.php
+++ b/auth/radius/lang/en/auth_radius.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/>.
 
 /**
- * Strings for component 'auth_radius', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_radius', language 'en'.
  *
  * @package   auth_radius
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/radius/version.php b/auth/radius/version.php
index 83e3b7f0f93..60bc1eacc2c 100644
--- a/auth/radius/version.php
+++ b/auth/radius/version.php
@@ -17,8 +17,7 @@
 /**
  * Version information
  *
- * @package    auth
- * @subpackage radius
+ * @package    auth_radius
  * @copyright  1999 onwards Martin Dougiamas (http://dougiamas.com)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/shibboleth/auth.php b/auth/shibboleth/auth.php
index 842b7351153..a9ed477306d 100644
--- a/auth/shibboleth/auth.php
+++ b/auth/shibboleth/auth.php
@@ -1,26 +1,29 @@
 <?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/>.
+
 /**
- * @author Martin Dougiamas
- * @author Lukas Haemmerle
- * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
- * @package moodle multiauth
- *
  * Authentication Plugin: Shibboleth Authentication
- *
  * Authentication using Shibboleth.
  *
  * Distributed under GPL (c)Markus Hagman 2004-2006
  *
- * 10.2004     SHIBBOLETH Authentication functions v.0.1
- * 05.2005     Various extensions and fixes by Lukas Haemmerle
- * 10.2005     Added better error messags
- * 05.2006     Added better handling of mutli-valued attributes
- * 2006-08-28  File created, code imported from lib.php
- * 2006-10-27  Upstream 1.7 changes merged in, added above credits from lib.php :-)
- * 2007-03-09  Fixed authentication but may need some other changes
- * 2007-10-03  Removed requirement for email address, surname and given name on request of Markus Hagman
-  * 2008-01-21 Added WAYF functionality
-
+ * @package auth_shibboleth
+ * @author Martin Dougiamas
+ * @author Lukas Haemmerle
+ * @license http://www.gnu.org/copyleft/gpl.html GNU Public License
  */
 
 if (!defined('MOODLE_INTERNAL')) {
diff --git a/auth/shibboleth/lang/en/auth_shibboleth.php b/auth/shibboleth/lang/en/auth_shibboleth.php
index ea8980d7787..552bb6c46e8 100644
--- a/auth/shibboleth/lang/en/auth_shibboleth.php
+++ b/auth/shibboleth/lang/en/auth_shibboleth.php
@@ -16,7 +16,7 @@
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
 /**
- * Strings for component 'auth_shibboleth', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_shibboleth', language 'en'.
  *
  * @package   auth_shibboleth
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/shibboleth/version.php b/auth/shibboleth/version.php
index 33f89655ed4..d30ecd0f34b 100644
--- a/auth/shibboleth/version.php
+++ b/auth/shibboleth/version.php
@@ -17,8 +17,7 @@
 /**
  * Version information
  *
- * @package    auth
- * @subpackage shibboleth
+ * @package    auth_shibboleth
  * @author     Martin Dougiamas
  * @author     Lukas Haemmerle
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
diff --git a/auth/webservice/auth.php b/auth/webservice/auth.php
index 59e1603ddb6..1a83e6f26fb 100644
--- a/auth/webservice/auth.php
+++ b/auth/webservice/auth.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,8 +18,7 @@
  * Web service auth plugin, reserves username, prevents normal login.
  * TODO: add IP restrictions and some other features - MDL-17135
  *
- * @package    moodlecore
- * @subpackage webservice
+ * @package    auth_webservice
  * @copyright  2008 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
diff --git a/auth/webservice/lang/en/auth_webservice.php b/auth/webservice/lang/en/auth_webservice.php
index a2fb8547353..105fb9be317 100644
--- a/auth/webservice/lang/en/auth_webservice.php
+++ b/auth/webservice/lang/en/auth_webservice.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/>.
 
 /**
- * Strings for component 'auth_webservice', language 'en', branch 'MOODLE_20_STABLE'
+ * Strings for component 'auth_webservice', language 'en'.
  *
  * @package   auth_webservice
  * @copyright 1999 onwards Martin Dougiamas  {@link http://moodle.com}
diff --git a/auth/webservice/version.php b/auth/webservice/version.php
index 12c661383ac..cd590a9013f 100644
--- a/auth/webservice/version.php
+++ b/auth/webservice/version.php
@@ -17,8 +17,7 @@
 /**
  * Version information
  *
- * @package    auth
- * @subpackage webservice
+ * @package    auth_webservice
  * @copyright  2011 Petr Skoda (http://skodak.org)
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */