6 files changed, 34 insertions, 7 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 41fd061e75..3649e7be51 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -233,6 +233,7 @@ p a {
 		<li>[Fix] Prevent {URL} token in custom BBCodes from make_clickable messing (Bug #14151)</li>
 		<li>[Sec] Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.</li>
 		<li>[Fix] Convert 2.0 moderator posting permissions (Bug #14105)</li>
+		<li>[Fix] Correctly apply PM box limit of 0 to custom folder (Bug #14154)</li>
 
 	</ul>
 
@@ -544,7 +545,7 @@ p a {
 
 	<div class="paragraph">
 
-	<p>This application is opensource software released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 </div>
 <a href="#top">Top</a>
diff --git a/phpBB/docs/FAQ.html b/phpBB/docs/FAQ.html
index 0ceba33038..0ccc7c0886 100644
--- a/phpBB/docs/FAQ.html
+++ b/phpBB/docs/FAQ.html
@@ -364,7 +364,7 @@ p a {
 
 <div class="paragraph">
 
-	<p>This application is opensource software released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 </div>
 <a href="#top">Top</a>
diff --git a/phpBB/docs/INSTALL.html b/phpBB/docs/INSTALL.html
index 8d9cac6cf3..e87614b5b2 100644
--- a/phpBB/docs/INSTALL.html
+++ b/phpBB/docs/INSTALL.html
@@ -531,7 +531,7 @@ p a {
 
 	<div class="paragraph">
 
-	<p>This application is opensource software released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 </div>
 <a href="#top">Top</a>
diff --git a/phpBB/docs/README.html b/phpBB/docs/README.html
index 9f84503ef2..3dc47ae63b 100644
--- a/phpBB/docs/README.html
+++ b/phpBB/docs/README.html
@@ -431,7 +431,7 @@ p a {
 
 	<div class="paragraph">
 
-	<p>This application is opensource software released under the <a href="http://www.gnu.org/licenses/gpl.html">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
 
 </div>
 <a href="#top">Top</a>
diff --git a/phpBB/docs/auth_api.html b/phpBB/docs/auth_api.html
index 8f86ae2740..f744466254 100644
--- a/phpBB/docs/auth_api.html
+++ b/phpBB/docs/auth_api.html
@@ -178,7 +178,7 @@ body {
 
 <a name="top"></a><div id="main">
 
-<p>This is an explanation of how to use the phpBB auth/acl API. This document is (c) 2006 phpBB Group, copying or redistribution is not allowed without permission.</p>
+<p>This is an explanation of how to use the phpBB auth/acl API.</p>
 
 <h1>Auth API</h1>
 
@@ -195,6 +195,7 @@ body {
 	</ol>
 	</li>
 	<li><a href="#admin_related">Admin related functions</a></li>
+	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
 </ol>
 
 <hr />
@@ -360,6 +361,18 @@ $auth_admin = new auth_admin();
 
 	</div>
 	<a href="#top">Top</a>
+	<br /><br />
+
+	<hr />
+
+<a name="disclaimer"></a><h1>4. Copyright and disclaimer</h1>
+
+	<div class="paragraph">
+
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+
+</div>
+<a href="#top">Top</a>
 
 </div>
 
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index 1efeadb111..a407be10ee 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -192,7 +192,7 @@ p a {
 
 <!-- BEGIN DOCUMENT -->
 
-<p>These are the phpBB Coding Guidelines for Olympus, all attempts should be made to follow them as closely as possible.<br />This document is (c) 2006 phpBB Group, copying or redistribution is not allowed without permission.</p>
+<p>These are the phpBB Coding Guidelines for Olympus, all attempts should be made to follow them as closely as possible.</p>
 
 <h1>Coding Guidelines</h1>
 
@@ -224,6 +224,7 @@ p a {
 	</ol>
 	</li>
 	<li><a href="#changes">Guidelines Changelog</a></li>
+	<li><a href="#disclaimer">Copyright and disclaimer</a></li>
 </ol>
 
 <hr />
@@ -803,7 +804,7 @@ $sql = 'SELECT *
 
 	<h3>sql_escape():</h3>
 
-	<p>Always use <code>$db-&gt;sql_escape()</code> if you need to check for a string within an SQL statement (even if you are sure the variable can not contain single quotes - never trust your input), for example:</p>
+	<p>Always use <code>$db-&gt;sql_escape()</code> if you need to check for a string within an SQL statement (even if you are sure the variable cannot contain single quotes - never trust your input), for example:</p>
 
 	<blockquote><pre>
 $sql = 'SELECT *
@@ -2355,6 +2356,18 @@ if (utf8_case_fold_nfc($string1) == utf8_case_fold_nfc($string2))
 
 </div>
 <a href="#top">Top</a>
+<br /><br />
+
+<hr />
+
+<a name="disclaimer"></a><h1>8. Copyright and disclaimer</h1>
+
+	<div class="paragraph">
+
+	<p>This application is opensource software released under the <a href="http://opensource.org/licenses/gpl-license.php">GPL</a>. Please see source code and the docs directory for more details. This package and its contents are Copyright (c) 2000, 2002, 2005, 2007 <a href="http://www.phpbb.com/">phpBB Group</a>, All Rights Reserved.</p>
+
+</div>
+<a href="#top">Top</a>
 
 <!-- END DOCUMENT -->