summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2013-03-06 00:36:46 +0100
committerAndrey Andreev <narf@bofh.bg>2013-03-06 00:36:46 +0100
commit050722c918d61029be9391589feee1f08e7e5033 (patch)
tree8f442bba3f8a70763b16132d21750ec108420f7d /user_guide_src
parentd8efc9559c0fdd4cb75f621042eb028a762fd984 (diff)
parent9a6032d87f3911ec6fcaf23736545920198a8b04 (diff)
Merge pull request #2304 from vlakoff/develop
Documentation: update reserved names list
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/general/common_functions.rst2
-rw-r--r--user_guide_src/source/general/reserved_names.rst18
2 files changed, 18 insertions, 2 deletions
diff --git a/user_guide_src/source/general/common_functions.rst b/user_guide_src/source/general/common_functions.rst
index 7917d3239..79bd9b459 100644
--- a/user_guide_src/source/general/common_functions.rst
+++ b/user_guide_src/source/general/common_functions.rst
@@ -31,7 +31,7 @@ version of PHP is lower than the supplied version number.
is_really_writable()
====================
-.. php:function:: is_really_writeable($file)
+.. php:function:: is_really_writable($file)
:param string $file: File path
:returns: bool
diff --git a/user_guide_src/source/general/reserved_names.rst b/user_guide_src/source/general/reserved_names.rst
index d91292363..ccc17d61b 100644
--- a/user_guide_src/source/general/reserved_names.rst
+++ b/user_guide_src/source/general/reserved_names.rst
@@ -25,15 +25,21 @@ your controller any of these:
Functions
---------
+- :php:func:`is_php()`
- :php:func:`is_really_writable()`
- ``load_class()``
+- ``is_loaded()``
- ``get_config()``
- :php:func:`config_item()`
- :php:func:`show_error()`
- :php:func:`show_404()`
- :php:func:`log_message()`
+- :php:func:`set_status_header()`
- :php:func:`get_mimes()`
- :php:func:`html_escape()`
+- :php:func:`remove_invisible_characters()`
+- :php:func:`is_https()`
+- :php:func:`function_usable()`
- :php:func:`get_instance()`
- ``_exception_handler()``
- ``_stringify_attributes()``
@@ -66,4 +72,14 @@ Constants
- FOPEN_WRITE_CREATE
- FOPEN_READ_WRITE_CREATE
- FOPEN_WRITE_CREATE_STRICT
-- FOPEN_READ_WRITE_CREATE_STRICT \ No newline at end of file
+- FOPEN_READ_WRITE_CREATE_STRICT
+- EXIT_SUCCESS
+- EXIT_ERROR
+- EXIT_CONFIG
+- EXIT_UNKNOWN_FILE
+- EXIT_UNKNOWN_CLASS
+- EXIT_UNKNOWN_METHOD
+- EXIT_USER_INPUT
+- EXIT_DATABASE
+- EXIT__AUTO_MIN
+- EXIT__AUTO_MAX \ No newline at end of file