10 files changed, 72 insertions, 39 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php
index 5f672ca092..ba293f0c76 100644
--- a/phpBB/install/convertors/convert_phpbb20.php
+++ b/phpBB/install/convertors/convert_phpbb20.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package install
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php
index b5a69abe93..ff20154d03 100644
--- a/phpBB/install/convertors/functions_phpbb20.php
+++ b/phpBB/install/convertors/functions_phpbb20.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package install
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/install/data/confusables.php b/phpBB/install/data/confusables.php
index f5d3b11731..e3e8c41e62 100644
--- a/phpBB/install/data/confusables.php
+++ b/phpBB/install/data/confusables.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package install
-* @copyright (c) 2007 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/install/data/new_normalizer.php b/phpBB/install/data/new_normalizer.php
index 380998f530..52652a4f6d 100644
--- a/phpBB/install/data/new_normalizer.php
+++ b/phpBB/install/data/new_normalizer.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package install
-* @copyright (c) 2007 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index b1bfbc1839..cf70019035 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package phpBB3
-* @copyright (c) 2012 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
diff --git a/phpBB/install/index.php b/phpBB/install/index.php
index 85fedaddfc..53ddad056c 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package install
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -272,9 +276,6 @@ $template->set_filenames(array(
 
 $install->page_footer();
 
-/**
-* @package install
-*/
 class module
 {
 	var $id = 0;
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php
index 13001426f7..674a1f7dd3 100644
--- a/phpBB/install/install_convert.php
+++ b/phpBB/install/install_convert.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package install
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -31,7 +35,6 @@ if (!empty($setmodules))
 
 /**
 * Class holding all convertor-specific details.
-* @package install
 */
 class convert
 {
@@ -75,7 +78,6 @@ class convert
 
 /**
 * Convert class for conversions
-* @package install
 */
 class install_convert extends module
 {
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index f9d5edc903..576cbba3ca 100644
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package install
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -36,7 +40,6 @@ if (!empty($setmodules))
 
 /**
 * Installation
-* @package install
 */
 class install_install extends module
 {
diff --git a/phpBB/install/install_main.php b/phpBB/install/install_main.php
index 974b006db3..2f37fc3237 100644
--- a/phpBB/install/install_main.php
+++ b/phpBB/install/install_main.php
@@ -1,9 +1,13 @@
 <?php
 /**
 *
-* @package install
-* @copyright (c) 2005 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
 */
 
@@ -31,7 +35,6 @@ if (!empty($setmodules))
 
 /**
 * Main Tab - Installation
-* @package install
 */
 class install_main extends module
 {
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index 87b7d8d703..1a90efc2b4 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -1,15 +1,20 @@
 <?php
 /**
 *
-* @package install
-* @copyright (c) 2006 phpBB Group
-* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
 *
-* @todo check for writable cache/store/files directory
 */
 
 /**
+* @todo check for writable cache/store/files directory
 */
+
 if (!defined('IN_INSTALL'))
 {
 	// Someone has tried to access the file directly. This is not a good idea, so exit
@@ -37,7 +42,6 @@ if (!empty($setmodules))
 
 /**
 * Update Installation
-* @package install
 */
 class install_update extends module
 {