commit 2020409b1083c14eeef83f6a226b26ef43b79682
author Andrey Andreev <narf@devilix.net> Mon Jan 05 09:35:06 2015 +0200
committer Andrey Andreev <narf@devilix.net> Mon Jan 05 09:35:06 2015 +0200
tree 26f5eb7a3cc15a1837be19b117dd356e23ad1b9a
parent 21f2e06d3e6c0218b3a1a0fcd19f67dc4058712e
parent 0cd17c337a396ad0677e65392f668b31814f67eb

Merge pull request #3458 from vlakoff/documentation

Update reserved controller names

user_guide_src/source/general/reserved_names.rst

diff --git a/user_guide_src/source/general/reserved_names.rst b/user_guide_src/source/general/reserved_names.rst
index 09c4549..9da94b3 100644
--- a/user_guide_src/source/general/reserved_names.rst
+++ b/user_guide_src/source/general/reserved_names.rst
@@ -16,9 +16,7 @@
 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