Skip to content

Commit

Permalink
Merge pull request codeigniter4#4000 from kenjis/fix-docs-installation
Browse files Browse the repository at this point in the history
docs: fix installation indentation
  • Loading branch information
paulbalandan authored and mostafakhudair committed Dec 19, 2020
2 parents c093983 + 05bebb6 commit 7967cb1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 11 deletions.
20 changes: 12 additions & 8 deletions env
Original file line number Diff line number Diff line change
Expand Up @@ -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

#--------------------------------------------------------------------
Expand Down Expand Up @@ -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'
4 changes: 2 additions & 2 deletions user_guide_src/source/installation/troubleshooting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 :(
-------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion user_guide_src/source/installation/upgrading.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit 7967cb1

Please sign in to comment.