Merge branch '4.1'

* 4.1:
  remove acl
  Small fix to syntax
  Assume the user is using Flex when deploying

Author: xabbuh

components/security.rst

@@ -9,7 +9,7 @@ The Security Component
     authentication, interactive form login or X.509 certificate login, but also
     allows you to implement your own authentication strategies. Furthermore, the
     component provides ways to authorize authenticated users based on their
-    roles, and it contains an advanced ACL system.
+    roles.
 
 Installation
 ------------
@@ -36,9 +36,6 @@ used separately:
 ``symfony/security-csrf``
     It provides protection against `CSRF attacks`_.
 
-``symfony/security-acl``
-    It provides a fine grained permissions mechanism based on Access Control Lists.
-
 .. seealso::
 
     This article explains how to use the Security features as an independent

components/var_dumper.rst

@@ -119,7 +119,7 @@ Inside a Symfony application, the output of the dump server is configured with
 the :ref:`dump_destination option <configuration-debug-dump_destination>` of the
 ``debug`` package.
 
-Outside a Symfony application, use the ``ServerDumper`` class:
+Outside a Symfony application, use the ``ServerDumper`` class::
 
     require __DIR__.'/vendor/autoload.php';
     

deployment.rst

@@ -157,7 +157,7 @@ as you normally do:
 .. caution::
 
     If you get a "class not found" error during this step, you may need to
-    run ``export SYMFONY_ENV=prod`` (or ``export APP_ENV=prod`` if you're
+    run ``export APP_ENV=prod`` (or ``export SYMFONY_ENV=prod`` if you're not
     using :doc:`Symfony Flex </setup/flex>`) before running this command so
     that the ``post-install-cmd`` scripts run in the ``prod`` environment.