Merge branch 'master' into imgbot

Author: dobooth

src/_includes/install/allowoverrides22.md

@@ -19,7 +19,7 @@ Failure to enable these settings typically results in no styles displaying on yo
 
    ```terminal
    <Directory "/var/www/html">
-       AllowOverride  <value from Apache site>
+       AllowOverride All
    </Directory>
    ```
 

src/_includes/install/allowoverrides24.md

@@ -13,13 +13,26 @@ Magento supports Apache 2.4.x.
 
 ## Help if you are just starting out {#apache-help-beginner}
 
-If you're new to all this and need some help getting started, we suggest the following:
+If you are new to all this and need some help getting started, we suggest the following:
 
 *  [Is the Magento software installed already?]({{page.baseurl }}/install-gde/basics/basics_magento-installed.html)
 *  [What is the software that the Magento server needs to run?]({{page.baseurl }}/install-gde/basics/basics_software.html)
 *  [What operating system is my server running?]({{page.baseurl }}/install-gde/basics/basics_os-version.html)
 *  [How do I log in to my Magento server using a terminal, command prompt, or SSH?]({{page.baseurl }}/install-gde/basics/basics_login.html)
 
+## Important: Apache required directives {#apache-required-directives}
+
+1. Set `AllowEncodedSlashes` in the server config (globally) or in the virtual host configurations to avoid decoding the encoded slashes that may cause issues for URLs. For instance, when retrieving products with a slash in the SKU via the API, you will not want that converted.
+
+   ```conf
+   <VirtualHost *:443>
+     ...
+     # Allow encoded slashes
+     AllowEncodedSlashes NoDecode
+     ...
+   </VirtualHost>
+   ```
+
 ## Important: Apache rewrites and .htaccess {#apache-help-rewrite}
 
 This topic discusses how to enable Apache 2.2 rewrites and specify a setting for the [distributed configuration file, `.htaccess`](http://httpd.apache.org/docs/current/howto/htaccess.html){:target="_blank"}.
@@ -30,10 +43,6 @@ Magento uses server rewrites and `.htaccess` to provide directory-level instruct
 {% include install/allowoverrides24.md %}
 {% endcollapsible %}
 
-{% collapsible Click to show Apache 2.2 instructions %}
-{% include install/allowoverrides22.md %}
-{% endcollapsible %}
-
 {:.bs-callout-info}
 Failure to enable these settings typically results in no styles displaying on your storefront or Admin.
 
@@ -105,10 +114,6 @@ To install the default version of Apache (Ubuntu 14, 16---Apache 2.4, Ubuntu 12-
 
 {% include install/allowoverrides24.md %}
 
-### Enable rewrites and .htaccess for Apache 2.2
-
-{% include install/allowoverrides22.md %}
-
 {:.ref-header}
 Next steps
 
@@ -207,11 +212,92 @@ Installing and configuring Apache is basically a three-step process: install the
 1. Continue with the next section.
 
    {:.bs-callout-info}
-   Even though Apache 2.4 is provided by default with CentOS 7, you configure it like Apache 2.2. See the following section.
+   Even though Apache 2.4 is provided by default with CentOS 7. See the following section to configure it.
+
+### Enable rewrites and .htaccess for CentOS 7
+
+1. Open `/etc/httpd/conf/httpd.conf` file for editing:
+
+   ```bash
+   vim /etc/httpd/conf/httpd.conf`
+   ```
+
+1. Locate the block that starts with:
+
+   ```conf
+   <Directory /var/www/html>
+   ```
+
+1. Change the value of `AllowOverride` to `All`.
+
+   For example,
+
+   ```conf
+   <Directory /var/www/>
+     Options Indexes FollowSymLinks MultiViews
+     AllowOverride All
+     Order allow,deny
+     Allow from all
+   <Directory>
+   ```
+
+   {:.bs-callout-info}
+   The preceding values for `Order` might not work in all cases. For more information, see the Apache documentation ([2.4](https://httpd.apache.org/docs/2.4/mod/mod_authz_host.html#order)).
+
+1. Save the file and exit the text editor.
 
-### Enable rewrites and .htaccess for Apache 2.2 (including CentOS 7)
+1. To apply Apache settings, restart Apache.
+
+   ```bash
+   service apache2 restart
+   ```
 
-{% include install/allowoverrides22.md %}
+{:.bs-callout-info}
+Failure to enable these settings typically results in no styles displaying on your storefront or Admin.
+
+### Enable rewrites and .htaccess for Ubuntu
+
+1. Open `/etc/apache2/sites-available/default` file for editing:
+
+   ```bash
+   vim /etc/apache2/sites-available/default
+   ```
+
+1. Locate the block that starts with:
+
+   *  Ubuntu 12: `<Directory /var/www/>`
+   *  Ubuntu 14: `<Directory /var/www/html>`
+
+1. Change the value of `AllowOverride` to `All`.
+
+   An example for Ubuntu 12 follows:
+
+   ```conf
+   <Directory /var/www/>
+     Options Indexes FollowSymLinks MultiViews
+     AllowOverride All
+     Order allow,deny
+     Allow from all
+   <Directory>
+   ```
+
+1. Save the file and exit the text editor.
+
+1. Configure Apache to use the `mod_rewrite` module:
+
+   ```bash
+   cd /etc/apache2/mods-enabled
+   ```
+
+   ```bash
+   ln -s ../mods-available/rewrite.load
+   ```
+
+1. Restart Apache to apply changes:
+
+   ```bash
+   service apache2 restart
+   ```
 
 {:.ref-header}
 Next steps
@@ -239,7 +325,7 @@ For example:
 ```conf
 <Directory /var/www/>
   Options Indexes FollowSymLinks MultiViews
-  AllowOverride <value from Apache site>
+  AllowOverride All
   Order allow,deny
   Require all granted
 </Directory>
@@ -257,7 +343,7 @@ For example:
 ```conf
 <Directory /var/www/>
   Options Indexes FollowSymLinks MultiViews
-  AllowOverride <value from Apache site>
+  AllowOverride All
   Order allow,deny
   Allow from all
 </Directory>