Skip to content

Commit

Permalink
Merge pull request #8721 from kenjis/docs-fix-deployment-to-shared-ho…
Browse files Browse the repository at this point in the history
…sting

docs: fix merge mistake about "Deployment to Shared Hosting Services"
  • Loading branch information
kenjis authored Apr 7, 2024
2 parents 7188805 + bf5da9a commit 8fd2799
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 25 deletions.
24 changes: 24 additions & 0 deletions user_guide_src/source/installation/deployment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -177,3 +177,27 @@ And edit **.htaccess** as follows:
Require all denied
Satisfy All
</FilesMatch>
And remove the redirect settings in **public/.htaccess**:

.. code-block:: diff
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -16,16 +16,6 @@ Options -Indexes
# http://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase
# RewriteBase /
- # Redirect Trailing Slashes...
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond %{REQUEST_URI} (.+)/$
- RewriteRule ^ %1 [L,R=301]
-
- # Rewrite "www.example.com -> example.com"
- RewriteCond %{HTTPS} !=on
- RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
- RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
-
# Checks to see if the user is attempting to access a valid file,
# such as an image or css document, if this isn't true it sends the
# request to the front controller, index.php
25 changes: 0 additions & 25 deletions user_guide_src/source/installation/running.rst
Original file line number Diff line number Diff line change
Expand Up @@ -497,31 +497,6 @@ Deployment to Shared Hosting Services

See :ref:`Deployment <deployment-to-shared-hosting-services>`.


And remove the redirect settings in **public/.htaccess**:

.. code-block:: diff
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -16,16 +16,6 @@ Options -Indexes
# http://httpd.apache.org/docs/current/mod/mod_rewrite.html#rewritebase
# RewriteBase /
- # Redirect Trailing Slashes...
- RewriteCond %{REQUEST_FILENAME} !-d
- RewriteCond %{REQUEST_URI} (.+)/$
- RewriteRule ^ %1 [L,R=301]
-
- # Rewrite "www.example.com -> example.com"
- RewriteCond %{HTTPS} !=on
- RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]
- RewriteRule ^ http://%1%{REQUEST_URI} [R=301,L]
-
# Checks to see if the user is attempting to access a valid file,
# such as an image or css document, if this isn't true it sends the
# request to the front controller, index.php
*********************
Bootstrapping the App
*********************
Expand Down

0 comments on commit 8fd2799

Please sign in to comment.