Merge branch '5.1' into 5.x

* 5.1:
  [DependencyInjection] Fix tagged service priority inconsistent method name
  Fixed table margin
  Remove paragraph about .htaccess files

Author: javiereguiluz

service_container/tags.rst

@@ -653,8 +653,9 @@ service itself::
         }
     }
 
-If you want to have another method defining the priority, you can define it
-in the configuration of the collecting service:
+If you want to have another method defining the priority 
+(e.g. ``getPriority()`` rather than ``getDefaultPriority()``),
+you can define it in the configuration of the collecting service:
 
 .. configuration-block::
 

setup/web_server_configuration.rst

@@ -374,13 +374,6 @@ The **minimum configuration** to get your application running under Nginx is:
     After you deploy to production, make sure that you **cannot** access the ``index.php``
     script (i.e. ``http://example.com/index.php``).
 
-.. note::
-
-    By default, Symfony applications include several ``.htaccess`` files to
-    configure redirections and to prevent unauthorized access to some sensitive
-    directories. Those files are only useful when using Apache, so you can
-    safely remove them when using Nginx.
-
 For advanced Nginx configuration options, read the official `Nginx documentation`_.
 
 .. _`Apache documentation`: https://httpd.apache.org/docs/