summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-01-05 08:35:06 +0100
committerAndrey Andreev <narf@devilix.net>2015-01-05 08:35:06 +0100
commit2020409b1083c14eeef83f6a226b26ef43b79682 (patch)
tree26f5eb7a3cc15a1837be19b117dd356e23ad1b9a
parent21f2e06d3e6c0218b3a1a0fcd19f67dc4058712e (diff)
parent0cd17c337a396ad0677e65392f668b31814f67eb (diff)
Merge pull request #3458 from vlakoff/documentation
Update reserved controller names
-rw-r--r--user_guide_src/source/general/reserved_names.rst4
1 files changed, 1 insertions, 3 deletions
diff --git a/user_guide_src/source/general/reserved_names.rst b/user_guide_src/source/general/reserved_names.rst
index 09c4549fd..9da94b398 100644
--- a/user_guide_src/source/general/reserved_names.rst
+++ b/user_guide_src/source/general/reserved_names.rst
@@ -16,9 +16,7 @@ the ones used by that class, otherwise your local methods will
override them. The following is a list of reserved names. Do not name
your controller any of these:
-- Controller
-- CI_Base
-- _ci_initialize
+- CI_Controller
- Default
- index