From c6da50384e06c60e242cb4442abb9c6c9b450674 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Tue, 9 Mar 2010 20:44:27 -0600
Subject: completely removed Plugins from CodeIgniter

---
 user_guide/general/reserved_names.html | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'user_guide/general/reserved_names.html')

diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index c9946e7d1..8abfbe6ce 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -71,7 +71,7 @@ is a list of reserved names.  Do not name your controller functions any of these
 	<li>Default (PHP 5)</li>
 	<li>index</li>
 </ul>
-<p><br />
+<p><br /><!-- @PHP4 -->
 	If you are running PHP 4 there are some additional reserved names. These ONLY apply if you are running PHP 4.</p>
 <ul>
 	<li>CI_Loader</li>
@@ -85,8 +85,6 @@ is a list of reserved names.  Do not name your controller functions any of these
 	<li>language</li>
 	<li>library</li>
 	<li>model</li>
-	<li>plugin</li>
-	<li>plugins</li>
 	<li>scaffolding</li>
 	<li>script</li>
 	<li>view</li>
-- 
cgit v1.2.3-24-g4f1b