Merge remote branch 'igorw/fix-htaccess'

* igorw/fix-htaccess:
  also disable apache MultiViews
  remove -d from .htaccess RewriteCond

doc/usage.rst

@@ -30,11 +30,12 @@ are using apache you can use a ``.htaccess`` file for this.
 .. code-block:: apache
 
     <IfModule mod_rewrite.c>
-    	RewriteEngine On
-    	#RewriteBase /path/to/app
-    	RewriteCond %{REQUEST_FILENAME} !-f
-    	RewriteCond %{REQUEST_FILENAME} !-d
-    	RewriteRule ^(.*)$ index.php [QSA,L]
+        Options -MultiViews
+
+        RewriteEngine On
+        #RewriteBase /path/to/app
+        RewriteCond %{REQUEST_FILENAME} !-f
+        RewriteRule ^(.*)$ index.php [QSA,L]
     </IfModule>
 
 .. note::

example.htaccess

 <IfModule mod_rewrite.c>
-	RewriteEngine On
-	#RewriteBase /path/to/app
-	RewriteCond %{REQUEST_FILENAME} !-f
-	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteRule ^(.*)$ index.php [QSA,L]
+    Options -MultiViews
+
+    RewriteEngine On
+    #RewriteBase /path/to/app
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteRule ^(.*)$ index.php [QSA,L]
 </IfModule>