summaryrefslogtreecommitdiffstats
path: root/user_guide/general
diff options
context:
space:
mode:
Diffstat (limited to 'user_guide/general')
-rw-r--r--user_guide/general/reserved_names.html21
1 files changed, 12 insertions, 9 deletions
diff --git a/user_guide/general/reserved_names.html b/user_guide/general/reserved_names.html
index 60bdec2fc..1d09e3c4e 100644
--- a/user_guide/general/reserved_names.html
+++ b/user_guide/general/reserved_names.html
@@ -100,26 +100,29 @@ is a list of reserved names. Do not name your controller functions any of these
</ul>
<h3>Functions</h3>
<ul>
- <li>is_really_writable</li>
- <li>config_item</li>
- <li>show_error</li>
- <li>show_404</li>
- <li>log_message</li>
- <li>_exception_handler</li>
+ <li>is_really_writable()</li>
+ <li>load_class()</li>
+ <li>get_config()</li>
+ <li>config_item()</li>
+ <li>show_error()</li>
+ <li>show_404()</li>
+ <li>log_message()</li>
+ <li>_exception_handler()</li>
+ <li>get_instance()</li>
</ul>
<h3>Variables</h3>
<ul>
- <li>config</li>
- <li>mimes</li>
+ <li>$config</li>
+ <li>$mimes</li>
</ul>
<h3>Constants</h3>
<ul>
- <li>CI_VERSION</li>
<li>EXT</li>
<li>FCPATH</li>
<li>SELF</li>
<li>BASEPATH</li>
<li>APPPATH</li>
+ <li>CI_VERSION</li>
<li>FILE_READ_MODE</li>
<li>FILE_WRITE_MODE</li>
<li>DIR_READ_MODE</li>