Merge branch '2.7' into 2.8

* 2.7:
  Several typo fixes
  Update console.rst
  [#6917] some tweaks after review
  [Finder] document array use for locations

Author: xabbuh

components/finder.rst

@@ -82,7 +82,11 @@ directory to use for the search::
 Search in several locations by chaining calls to
 :method:`Symfony\\Component\\Finder\\Finder::in`::
 
-    $finder->files()->in(__DIR__)->in('/elsewhere');
+    // search inside *both* directories
+    $finder->files()->in(array(__DIR__, '/elsewhere'));
+
+    // same as above
+    $finder->in(__DIR__)->in('/elsewhere');
 
 Use wildcard characters to search in the directories matching a pattern::
 

console.rst

@@ -177,7 +177,7 @@ instead::
     }
 
 Now, once you created the required services and logic, the command will execute
-the ``generate()`` method of the ``app.user_manager`` service and the user will
+the ``create()`` method of the ``app.user_manager`` service and the user will
 be created.
 
 Command Lifecycle