Merge branch '4.1' into 4.2

* 4.1:
  Fix minor upgrade procedure first command
  Update user_provider.rst
  Fix variable name in code snippet

Author: javiereguiluz

components/asset.rst

@@ -215,7 +215,7 @@ that path over and over again::
     // result: /static/images/logo.png?v1
 
     // Base path is ignored when using absolute paths
-    echo $package->getUrl('/logo.png');
+    echo $pathPackage->getUrl('/logo.png');
     // result: /logo.png?v1
 
 Request Context Aware Assets
@@ -239,7 +239,7 @@ class can take into account the context of the current request::
     // result: /somewhere/static/images/logo.png?v1
 
     // Both "base path" and "base url" are ignored when using absolute path for asset
-    echo $package->getUrl('/logo.png');
+    echo $pathPackage->getUrl('/logo.png');
     // result: /logo.png?v1
 
 Now that the request context is set, the ``PathPackage`` will prepend the

security/user_provider.rst

@@ -14,7 +14,7 @@ that has two jobs:
 **Load the User for some Feature**
     Some features, like ``switch_user``, ``remember_me`` and many of the built-in
     :doc:`authentication providers </security/auth_providers>`, use the user provider
-    to load a User object via is "username" (or email, or whatever field you want).
+    to load a User object via its "username" (or email, or whatever field you want).
 
 Symfony comes with several built-in user providers:
 

setup/upgrade_minor.rst

@@ -46,7 +46,7 @@ Next, use Composer to download new versions of the libraries:
 
 .. code-block:: terminal
 
-    $ composer update "symfony/*" --with-all-dependencies
+    $ composer update "symfony/*"
 
 .. include:: /setup/_update_dep_errors.rst.inc