From bd0e3d92611f073a2013af5793ff445d0d133b0e Mon Sep 17 00:00:00 2001
From: Akshat Gupta <a.gupta93@gmail.com>
Date: Fri, 12 Dec 2014 08:01:37 +0530
Subject: [PATCH 1/2] Update url-rewriting.rst

just a small modification to the solution for users having apache2.4 and above as there is no httpd.conf in that version
---
 en/installation/url-rewriting.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/en/installation/url-rewriting.rst b/en/installation/url-rewriting.rst
index c00ff55534..02fa743b66 100644
--- a/en/installation/url-rewriting.rst
+++ b/en/installation/url-rewriting.rst
@@ -33,6 +33,15 @@ You may also take a look at http://wiki.apache.org/httpd/DistrosDefaultLayout fo
        #    Order deny,allow
        #    Deny from all
        </Directory>
+   
+   For users having apache 2.4 and above, you need to go to etc/apache2/sites-enabled/000-default.conf
+   and make the following changes to get it working.
+       <Directory /var/www/>
+            Options Indexes FollowSymLinks Includes
+            AllowOverride All
+            Order allow,deny
+            Allow from all
+       </Directory>
 
 #. Make sure you are loading mod\_rewrite correctly. You should
    see something like::

From 79f9f2c22f07248ada16ab6a2fdcee44e30369b8 Mon Sep 17 00:00:00 2001
From: Mark Story <mark@mark-story.com>
Date: Thu, 19 Nov 2015 21:15:29 -0500
Subject: [PATCH 2/2] Correct docs for apache 2.4

Order and Allow are gone in 2.4
---
 en/installation/url-rewriting.rst | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/en/installation/url-rewriting.rst b/en/installation/url-rewriting.rst
index 02fa743b66..41ea04388b 100644
--- a/en/installation/url-rewriting.rst
+++ b/en/installation/url-rewriting.rst
@@ -33,14 +33,15 @@ You may also take a look at http://wiki.apache.org/httpd/DistrosDefaultLayout fo
        #    Order deny,allow
        #    Deny from all
        </Directory>
-   
-   For users having apache 2.4 and above, you need to go to etc/apache2/sites-enabled/000-default.conf
-   and make the following changes to get it working.
+
+   For users having apache 2.4 and above, you need to modify the configuration
+   file for your ``httpd.conf`` or virtual host configuration to look like the
+   following::
+
        <Directory /var/www/>
-            Options Indexes FollowSymLinks Includes
+            Options FollowSymLinks
             AllowOverride All
-            Order allow,deny
-            Allow from all
+            Require all granted
        </Directory>
 
 #. Make sure you are loading mod\_rewrite correctly. You should