summaryrefslogtreecommitdiffstats
path: root/application/config
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2010-10-07 00:52:21 +0200
committerDerek Jones <derek.jones@ellislab.com>2010-10-07 00:52:21 +0200
commit124ac667046bfb662f4165934d953c0c8bded284 (patch)
tree8656623f4baa525c28933cc8a900502af10e53ae /application/config
parent2ef375969b77c5fdf84118d4a7a8e0bc97d9d2f6 (diff)
parent49ced91d1f5ab50068a66fdddff6be3f5c420565 (diff)
merging changes
Diffstat (limited to 'application/config')
-rw-r--r--application/config/config.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 3f2be480f..0b85ac5fc 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -274,9 +274,9 @@ $config['global_xss_filtering'] = FALSE;
/*
|--------------------------------------------------------------------------
-| Cross Site Forgery Request
+| Cross Site Request Forgery
|--------------------------------------------------------------------------
-| Enables a CSFR cookie token to be set. When set to TRUE, token will be
+| Enables a CSRF cookie token to be set. When set to TRUE, token will be
| checked on a submitted form. If you are accepting user data, it is strongly
| recommended CSRF protection be enabled.
*/