aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2011-01-13 13:38:36 +0000
committerChris Smith <toonarmy@phpbb.com>2011-01-13 13:38:36 +0000
commit78df30f7b76bf3fb0852c70b4e90e1acddc78b05 (patch)
treebf83b8fab10e4b3448cf656020ef60594e561ad0
parentbdac86777e1d10f65f8e780f6fbd46ba48d597fe (diff)
parent3bc64deaecb5dc908b05718aa33bb1525c794e33 (diff)
downloadforums-78df30f7b76bf3fb0852c70b4e90e1acddc78b05.tar
forums-78df30f7b76bf3fb0852c70b4e90e1acddc78b05.tar.gz
forums-78df30f7b76bf3fb0852c70b4e90e1acddc78b05.tar.bz2
forums-78df30f7b76bf3fb0852c70b4e90e1acddc78b05.tar.xz
forums-78df30f7b76bf3fb0852c70b4e90e1acddc78b05.zip
Merge branch 'task/igorw/acm-refactor' into develop
* task/igorw/acm-refactor: [task/acm-refactor] Remove includes/cache.php from coding guidelines
-rw-r--r--phpBB/docs/coding-guidelines.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/docs/coding-guidelines.html b/phpBB/docs/coding-guidelines.html
index c0ebb7450e..18b0bb026e 100644
--- a/phpBB/docs/coding-guidelines.html
+++ b/phpBB/docs/coding-guidelines.html
@@ -203,7 +203,7 @@ class ...
<ul>
<li><strong>phpBB3</strong><br />Core files and all files not assigned to a separate package</li>
- <li><strong>acm</strong><br /><code>/includes/cache</code>, <code>/includes/cache.php</code><br />Cache System</li>
+ <li><strong>acm</strong><br /><code>/includes/cache</code><br />Cache System</li>
<li><strong>acp</strong><br /><code>/adm</code>, <code>/includes/acp</code>, <code>/includes/functions_admin.php</code><br />Administration Control Panel</li>
<li><strong>dbal</strong><br /><code>/includes/db</code><br />Database Abstraction Layer.<br />Base class is <code>dbal</code>
<ul>