Commits

Pascal Kriete  committed dc3bbc9 Merge
  • Participants
  • Parent commits 1656d14, 2dc1b8a

Comments (0)

Files changed (1)

File user_guide/general/reserved_names.html

 	<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>