Skip to content

Commit caa6080

Browse files
authored
Merge pull request #8692 from kenjis/docs-running-add-htaccess
docs: fix sample .htaccess code in running.rst
2 parents 975f121 + b559dbd commit caa6080

File tree

1 file changed

+49
-0
lines changed

1 file changed

+49
-0
lines changed

user_guide_src/source/installation/running.rst

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,30 @@ And edit **.htaccess** as follows:
295295
Satisfy All
296296
</FilesMatch>
297297
298+
And remove the redirect settings in **public/.htaccess**:
299+
300+
.. code-block:: diff
301+
302+
--- a/public/.htaccess
303+
+++ b/public/.htaccess
304+
@@ -16,16 +16,6 @@ Options -Indexes
305+
# http://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase
306+
# RewriteBase /
307+
308+
- # Redirect Trailing Slashes...
309+
- RewriteCond %{REQUEST_FILENAME} !-d
310+
- RewriteCond %{REQUEST_URI} (.+)/$
311+
- RewriteRule ^ %1 [L,R=301]
312+
-
313+
- # Rewrite "www.example.com -> example.com"
314+
- RewriteCond %{HTTPS} !=on
315+
- RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
316+
- RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
317+
-
318+
# Checks to see if the user is attempting to access a valid file,
319+
# such as an image or css document, if this isn't true it sends the
320+
# request to the front controller, index.php
321+
298322
Hosting with mod_userdir (Shared Hosts)
299323
=======================================
300324

@@ -505,6 +529,31 @@ And edit **.htaccess** as follows:
505529
Satisfy All
506530
</FilesMatch>
507531
532+
533+
And remove the redirect settings in **public/.htaccess**:
534+
535+
.. code-block:: diff
536+
537+
--- a/public/.htaccess
538+
+++ b/public/.htaccess
539+
@@ -16,16 +16,6 @@ Options -Indexes
540+
# http://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase
541+
# RewriteBase /
542+
543+
- # Redirect Trailing Slashes...
544+
- RewriteCond %{REQUEST_FILENAME} !-d
545+
- RewriteCond %{REQUEST_URI} (.+)/$
546+
- RewriteRule ^ %1 [L,R=301]
547+
-
548+
- # Rewrite "www.example.com -> example.com"
549+
- RewriteCond %{HTTPS} !=on
550+
- RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
551+
- RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
552+
-
553+
# Checks to see if the user is attempting to access a valid file,
554+
# such as an image or css document, if this isn't true it sends the
555+
# request to the front controller, index.php
556+
508557
*********************
509558
Bootstrapping the App
510559
*********************

0 commit comments

Comments
 (0)