summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2015-04-30 11:49:52 +0200
committerAndrey Andreev <narf@devilix.net>2015-04-30 11:49:52 +0200
commitaf85f33ff83071d4d7ec5f540f5f9fe34278e34f (patch)
treec1acbbd888c6a810589e2d01b36be9f78925f046
parent0f8509025d2338dc069ddf42b6ade974a5da0ca3 (diff)
parent12617cf6602164a1b43a71aa8fc7c3571881d3be (diff)
Merge pull request #3824 from jim-parry/fix/docs
[ci skip] Fix typos in user guide
-rw-r--r--user_guide_src/source/general/controllers.rst2
-rw-r--r--user_guide_src/source/libraries/security.rst2
2 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/general/controllers.rst b/user_guide_src/source/general/controllers.rst
index bc8319dd8..7ab5a7f6a 100644
--- a/user_guide_src/source/general/controllers.rst
+++ b/user_guide_src/source/general/controllers.rst
@@ -138,7 +138,7 @@ present, as will be the case when only your site root URL is requested.
To specify a default controller, open your **application/config/routes.php**
file and set this variable::
- $route['default_controller'] = 'Blog';
+ $route['default_controller'] = 'blog';
Where Blog is the name of the controller class you want used. If you now
load your main index.php file without specifying any URI segments you'll
diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst
index ac56fc589..16b397994 100644
--- a/user_guide_src/source/libraries/security.rst
+++ b/user_guide_src/source/libraries/security.rst
@@ -88,7 +88,7 @@ may alter this behavior by editing the following config parameter
::
- $config['csrf_regeneration'] = TRUE;
+ $config['csrf_regenerate'] = TRUE;
Select URIs can be whitelisted from csrf protection (for example API
endpoints expecting externally POSTed content). You can add these URIs