From 55cf6b32cb61bcb068541f3b0cf83a96d252f580 Mon Sep 17 00:00:00 2001
From: Pascal Kriete <pascal.kriete@ellislab.com>
Date: Wed, 10 Nov 2010 15:51:35 -0500
Subject: Updating the reserved names docs to remove php 4 references.

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

diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index 7ab518d20..3115d6a8a 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -67,34 +67,9 @@ is a list of reserved names.  Do not name your controller any of these:</p>
 	<li>Controller</li>
 	<li>CI_Base</li>
 	<li>_ci_initialize</li>
-	<li>Default (PHP 5)</li>
+	<li>Default</li>
 	<li>index</li>
 </ul>
-<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>
-	<li>config</li>
-	<li>database</li>
-	<li>dbutil</li>
-	<li>dbforge</li>
-	<li>file</li>
-	<li>helper</li>
-	<li>helpers</li>
-	<li>language</li>
-	<li>library</li>
-	<li>model</li>
-	<li>script</li>
-	<li>view</li>
-	<li>vars</li>
-	<li>_ci_assign_to_models</li>
-	<li>_ci_autoloader</li>
-	<li>_ci_init_class</li>
-	<li>_ci_is_instance</li>
-	<li>_ci_load</li>
-	<li>_ci_load_class</li>
-	<li>_ci_object_to_array</li>
-</ul>
 <h3>Functions</h3>
 <ul>
 	<li>is_really_writable()</li>
-- 
cgit v1.2.3-24-g4f1b