9 files changed, 104 insertions, 99 deletions
diff --git a/phpBB/docs/AUTHORS b/phpBB/docs/AUTHORS
deleted file mode 100644
index 29ee72caa3..0000000000
--- a/phpBB/docs/AUTHORS
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
-*
-* phpBB3 © Copyright phpBB Group
-* http://www.phpbb.com
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, version 2 of the License.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program. If not, see <http://opensource.org/licenses/gpl-2.0.php>
-*
-*/
-
-Please see: http://www.phpbb.com/about/team/ for a list of all the people currently
-involved in phpBB.
-
-phpBB Lead Developer:  naderman (Nils Adermann)
-
-phpBB Developers:      bantu (Andreas Fischer)
-                       dhruv.goel92 (Dhruv Goel)
-                       EXreaction (Nathan Guse)
-                       imkingdavid (David King)
-                       marc1706 (Marc Alexander)
-                       nickvergessen (Joas Schilling)
-                       prototech (Cesar Gallegos)
-
-Contributions by:      leviatan21 (Gabriel Vazquez)
-                       Raimon (Raimon Meuldijk)
-                       Xore (Robert Hetzler)
-
-
--- Former Contributors --
-
-phpBB Project Manager: theFinn (James Atkinson)      [Founder - 04/2007]
-                       SHS` (Jonathan Stanley)
-
-phpBB Lead Developer:  Acyd Burn (Meik Sievertsen)   [09/2005 - 01/2010]
-                       psoTFX (Paul S. Owen)         [2001 - 09/2005]
-
-phpBB Developers:      A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
-                       Acyd Burn (Meik Sievertsen)   [02/2003 - 09/2005]
-                       APTX (Marek A. Ruszczyński)   [12/2007 - 04/2011]
-                       Arty (Vjacheslav Trushkin)    [02/2012 - 07/2012]
-                       Ashe (Ludovic Arnaud)         [10/2002 - 11/2003, 06/2006 - 10/2006]
-                       BartVB (Bart van Bragt)       [11/2000 - 03/2006]
-                       ckwalsh (Cullen Walsh)        [01/2010 - 07/2011]
-                       DavidMJ (David M.)            [12/2005 - 08/2009]
-                       dhn (Dominik Dröscher)        [05/2007 - 01/2011]
-                       GrahamJE (Graham Eames)       [09/2005 - 11/2006]
-                       kellanved (Henry Sudhof)      [04/2007 - 03/2011]
-                       igorw (Igor Wiedler)          [08/2010 - 02/2013]
-                       Oleg (Oleg Pudeyev)           [01/2011 - 05/2013]
-                       rxu (Ruslan Uzdenov)          [04/2010 - 12/2012]
-                       TerraFrost (Jim Wigginton)    [04/2009 - 01/2011]
-                       ToonArmy (Chris Smith)        [06/2008 - 11/2011]
-                       Vic D'Elfant (Vic D'Elfant)   [04/2007 - 04/2009]
-
--- Copyrights --
-
-Visual Confirmation:   Xore (Robert Hetzler)
-
-Original subSilver by subBlue Design, Tom Beddard, (c) 2001 phpBB Group
-prosilver by subBlue Design, Tom Beddard, (c) 2004 phpBB Group
-subsilver2 by subBlue Design, Tom Beddard, (c) 2004 phpBB Group
-
-phpBB3 contains code from the following applications:
-
-LGPL licenced:
-Smarty (c) 2001, 2002 by ispi of Lincoln, Inc, http://smarty.php.net/
-
-GPL licenced:
-phpMyAdmin (c) 2001,2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/
-Jabber Class (c) 2006 Flyspray.org, http://www.flyspray.org/
-Chora (c) 2000-2006, The Horde Project. http://horde.org/chora/
-Horde Project (c) 2000-2006, The Horde Project. http://horde.org/
-jQuery (c) 2011, John Resig. http://jquery.com/
-Sphinx Technologies Inc (c) 2001-2012 Andrew Aksyonoff, http://sphinxsearch.com/
-Plupload (c) 2010-2013 Moxiecode Systems AB, http://www.plupload.com/
-
-PHP License, version 3.0:
-Pear (c) 2001-2004 PHP Group, http://pear.php.net
-
-Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff
-
-MIT licenced:
-Symfony2 (c) 2004-2011 Fabien Potencier, http://symfony.com/
-
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index b1e85131f2..36d0ccf68d 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -3708,7 +3708,7 @@
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="https://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>phpBB is free software, released under the terms of the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License, version 2 (GPL-2.0)</a>. Copyright © <a href="https://www.phpbb.com">phpBB Limited</a>. For full copyright and license information, please see the docs/CREDITS.txt file.</p>
 
 		</div>
 
diff --git a/phpBB/docs/CREDITS.txt b/phpBB/docs/CREDITS.txt
new file mode 100644
index 0000000000..8c98843df5
--- /dev/null
+++ b/phpBB/docs/CREDITS.txt
@@ -0,0 +1,98 @@
+/**
+*
+* phpBB © Copyright phpBB Limited 2003-2014
+* http://www.phpbb.com
+*
+* phpBB is free software. You can redistribute it and/or modify it 
+* under the terms of the GNU General Public License, version 2 (GPL-2.0)
+* as published by the Free Software Foundation.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* A copy of the license can be viewed in the docs/LICENSE.txt file.
+* The same can be viewed at <http://opensource.org/licenses/gpl-2.0.php>
+*
+*/
+
+
+phpBB Project Manager:   Marshalrusty (Yuriy Rusko)
+
+phpBB Lead Developer:    naderman (Nils Adermann)
+
+phpBB Developers:        bantu (Andreas Fischer)
+                         dhruv.goel92 (Dhruv Goel)
+                         EXreaction (Nathan Guse)
+                         imkingdavid (David King)
+                         marc1706 (Marc Alexander)
+                         nickvergessen (Joas Schilling)
+                         prototech (Cesar Gallegos)
+
+For a list of phpBB Team members, please see:
+http://www.phpbb.com/about/team/
+
+For a full list of phpBB code contributors, please see:
+https://github.com/phpbb/phpbb/graphs/contributors
+
+-- Former Developers --
+
+phpBB Project Manager:   theFinn (James Atkinson)      [Founder - 04/2007]
+                         SHS` (Jonathan Stanley)
+
+phpBB Lead Developer:    Acyd Burn (Meik Sievertsen)   [09/2005 - 01/2010]
+                         psoTFX (Paul S. Owen)         [2001 - 09/2005]
+
+phpBB Developers:        A_Jelly_Doughnut (Josh Woody) [01/2010 - 11/2010]
+                         Acyd Burn (Meik Sievertsen)   [02/2003 - 09/2005]
+                         APTX (Marek A. Ruszczyński)   [12/2007 - 04/2011]
+                         Arty (Vjacheslav Trushkin)    [02/2012 - 07/2012]
+                         Ashe (Ludovic Arnaud)         [10/2002 - 11/2003, 06/2006 - 10/2006]
+                         BartVB (Bart van Bragt)       [11/2000 - 03/2006]
+                         ckwalsh (Cullen Walsh)        [01/2010 - 07/2011]
+                         DavidMJ (David M.)            [12/2005 - 08/2009]
+                         dhn (Dominik Dröscher)        [05/2007 - 01/2011]
+                         GrahamJE (Graham Eames)       [09/2005 - 11/2006]
+                         igorw (Igor Wiedler)          [08/2010 - 02/2013]
+                         kellanved (Henry Sudhof)      [04/2007 - 03/2011]
+                         Oleg (Oleg Pudeyev)           [01/2011 - 05/2013]
+                         rxu (Ruslan Uzdenov)          [04/2010 - 12/2012]
+                         TerraFrost (Jim Wigginton)    [04/2009 - 01/2011]
+                         ToonArmy (Chris Smith)        [06/2008 - 11/2011]
+                         Vic D'Elfant (Vic D'Elfant)   [04/2007 - 04/2009]
+
+Major contributions by:  leviatan21 (Gabriel Vazquez)
+                         Neothermic (Ashley Pinner)
+                         Raimon (Raimon Meuldijk)
+                         Xore (Robert Hetzler)
+
+-- Copyrights --
+
+Visual Confirmation:   Xore (Robert Hetzler)
+
+Original subSilver by subBlue Design, Tom Beddard, (c) 2001 phpBB Limited
+prosilver by subBlue Design, Tom Beddard, (c) 2004 phpBB Limited
+subsilver2 by subBlue Design, Tom Beddard, (c) 2004 phpBB Limited
+
+phpBB contains code from the following applications:
+
+LGPL licenced:
+Smarty (c) 2001, 2002 by ispi of Lincoln, Inc, http://smarty.php.net/
+
+GPL licenced:
+phpMyAdmin (c) 2001, 2003 phpMyAdmin Devel team, http://www.phpmyadmin.net/
+Jabber Class (c) 2006 Flyspray.org, http://www.flyspray.org/
+Chora (c) 2000-2006, The Horde Project. http://horde.org/chora/
+Horde Project (c) 2000-2006, The Horde Project. http://horde.org/
+jQuery (c) 2011, John Resig. http://jquery.com/
+Sphinx Technologies Inc (c) 2001-2012 Andrew Aksyonoff, http://sphinxsearch.com/
+Plupload (c) 2010-2013 Moxiecode Systems AB, http://www.plupload.com/
+
+PHP License, version 3.0:
+Pear (c) 2001-2004 PHP Group, http://pear.php.net
+
+Text_Diff-0.2.1 http://pear.php.net/package/Text_Diff
+
+MIT licenced:
+Symfony2 (c) 2004-2011 Fabien Potencier, http://symfony.com/
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html
index a76b6be72a..27e5706e2f 100644
--- a/phpBB/docs/FAQ.html
+++ b/phpBB/docs/FAQ.html
@@ -321,7 +321,7 @@ I want to sue you because i think you host an illegal board!</h2>
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="https://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>phpBB is free software, released under the terms of the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License, version 2 (GPL-2.0)</a>. Copyright © <a href="https://www.phpbb.com">phpBB Limited</a>. For full copyright and license information, please see the docs/CREDITS.txt file.</p>
 
 		</div>
 
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 0b5d06c191..0fce349974 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -449,7 +449,7 @@
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see the source code and <code>docs/</code> directory for more details. This package and its contents are Copyright &copy; <a href="https://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>phpBB is free software, released under the terms of the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License, version 2 (GPL-2.0)</a>. Copyright © <a href="https://www.phpbb.com">phpBB Limited</a>. For full copyright and license information, please see the docs/CREDITS.txt file.</p>
 
 		</div>
 
diff --git a/phpBB/docs/COPYING b/phpBB/docs/LICENSE.txt
index ce992b2ce7..ce992b2ce7 100644
--- a/phpBB/docs/COPYING
+++ b/phpBB/docs/LICENSE.txt
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index 27ace05169..5ac6d640f9 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -345,7 +345,7 @@
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright &copy; <a href="https://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>phpBB is free software, released under the terms of the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License, version 2 (GPL-2.0)</a>. Copyright © <a href="https://www.phpbb.com">phpBB Limited</a>. For full copyright and license information, please see the docs/CREDITS.txt file.</p>
 
 		</div>
 
diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html
index c68ae7821f..703e7a18c1 100644
--- a/phpBB/docs/auth_api.html
+++ b/phpBB/docs/auth_api.html
@@ -268,7 +268,7 @@ $auth_admin = new auth_admin();
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="https://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>phpBB is free software, released under the terms of the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License, version 2 (GPL-2.0)</a>. Copyright © <a href="https://www.phpbb.com">phpBB Limited</a>. For full copyright and license information, please see the docs/CREDITS.txt file.</p>
 
 		</div>
 
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index cedf03ba9b..9fdf098d1d 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -2546,7 +2546,7 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 
 		<div class="content">
 
-	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License v2</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) <a href="https://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>phpBB is free software, released under the terms of the <a href="http://opensource.org/licenses/gpl-2.0.php">GNU General Public License, version 2 (GPL-2.0)</a>. Copyright © <a href="https://www.phpbb.com">phpBB Limited</a>. For full copyright and license information, please see the docs/CREDITS.txt file.</p>
 
 		</div>