Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / htaccess.sample

diff --git a/htaccess.sample b/htaccess.sample
index af6e19784d1aa3f720571594b92a2b5f216a0b3b..8a689858c73b9ec3ac7f3bdb99de1726378e105a 100644 (file)
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -39,17 +39,8 @@
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
   RewriteRule (.*) index.php?p=$1 [L,QSA]
-
-  ## You can also use PATHINFO by using this RewriteRule instead:
-  # RewriteRule (.*) index.php/$1 [L,QSA]
 </IfModule>
 
 <FilesMatch "\.(ini)">
-    <IfVersion < 2.3>
-        Order allow,deny
-        Deny from all
-    </IfVersion>
-    <IfVersion >= 2.3>
-        Require all denied
-    </IfVersion>
+  Order allow,deny
 </FilesMatch>