diff --git a/env b/env
index cdab116294f9..707d7c60916e 100644
--- a/env
+++ b/env
@@ -37,14 +37,6 @@
 # app.cookieHTTPOnly = false
 # app.cookieSameSite = 'Lax'
 
-# app.CSRFProtection  = false
-# app.CSRFTokenName   = 'csrf_test_name'
-# app.CSRFCookieName  = 'csrf_cookie_name'
-# app.CSRFExpire      = 7200
-# app.CSRFRegenerate  = true
-# app.CSRFExcludeURIs = []
-# app.CSRFSameSite    = 'Lax'
-
 # app.CSPEnabled = false
 
 #--------------------------------------------------------------------
@@ -103,3 +95,15 @@
 # honeypot.name = 'honeypot'
 # honeypot.template = '<label>{label}</label><input type="text" name="{name}" value=""/>'
 # honeypot.container = '<div style="display:none">{template}</div>'
+
+#--------------------------------------------------------------------
+# SECURITY
+#--------------------------------------------------------------------
+
+# security.tokenName   = 'csrf_test_name'
+# security.headerName  = 'X-CSRF-TOKEN'
+# security.cookieName  = 'csrf_cookie_name'
+# security.expires     = 7200
+# security.regenerate  = true
+# security.redirect    = true
+# security.samesite    = 'Lax'
diff --git a/user_guide_src/source/installation/troubleshooting.rst b/user_guide_src/source/installation/troubleshooting.rst
index 8f480889087a..7aaa5ad658ea 100644
--- a/user_guide_src/source/installation/troubleshooting.rst
+++ b/user_guide_src/source/installation/troubleshooting.rst
@@ -36,11 +36,11 @@ alternate settings. If it still doesn't work after you've tried this
 you'll need to force CodeIgniter to add a question mark to your URLs. To
 do this open your *app/Config/App.php* file and change this::
 
-	public $indexPage = 'index.php';
+    public $indexPage = 'index.php';
 
 To this::
 
-	public $indexPage = 'index.php?';
+    public $indexPage = 'index.php?';
 
 The tutorial gives 404 errors everywhere :(
 -------------------------------------------
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index d1eca9fca17a..e39f92613e18 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -10,4 +10,4 @@ upgrading from.
 
     Upgrading from 4.0.4 to 4.0.5 <upgrade_405>
     Upgrading from 4.0.x to 4.0.4 <upgrade_404>
-	Upgrading from 3.x to 4.x <upgrade_4xx>
+    Upgrading from 3.x to 4.x <upgrade_4xx>