Merge branch '4.0'

* 4.0:
  [#9155] revert on the 4.0 branch
  minor #9152 Fix action name in controller (orions)
  Fix passing arguments to "Client" constructor
  Fixed the config file name for the other config formats too
  Revert back to SF 3 directory structure
  typo!
  Fix wrong filename
  Reword
  Update doctrine.rst

Author: xabbuh

components/browser_kit.rst

@@ -191,7 +191,9 @@ into the client constructor::
     use Acme\Client;
 
     // create cookies and add to cookie jar
-    $cookieJar = new Cookie('flavor', 'chocolate', strtotime('+1 day'));
+    $cookie = new Cookie('flavor', 'chocolate', strtotime('+1 day'));
+    $cookieJar = new CookieJar();
+    $cookieJar->set($cookie);
 
     // create a client and set the cookies
     $client = new Client(array(), null, $cookieJar);

doctrine.rst

@@ -40,6 +40,13 @@ The database connection information is stored as an environment variable called
 
     # to use sqlite:
     # DATABASE_URL="sqlite:///%kernel.project_dir%/var/app.db"
+    
+.. caution::
+
+    If the username, password or database name contain any character considered
+    special in a URI (such as ``!``, ``@``, ``$``, ``#``), you must encode them.
+    See `RFC 3986`_ for the full list of reserved characters or use the
+    :phpfunction:`urlencode` function to encode them.
 
 Now that your connection parameters are setup, Doctrine can create the ``db_name``
 database for you:
@@ -738,6 +745,7 @@ Learn more
 * `DoctrineFixturesBundle`_
 
 .. _`Doctrine`: http://www.doctrine-project.org/
+.. _`RFC 3986`: https://www.ietf.org/rfc/rfc3986.txt
 .. _`MongoDB`: https://www.mongodb.org/
 .. _`Doctrine's Mapping Types documentation`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/basic-mapping.html
 .. _`Query Builder`: http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/reference/query-builder.html

doctrine/multiple_entity_managers.rst

@@ -238,7 +238,7 @@ the default entity manager (i.e. ``default``) is returned::
         public function indexAction(EntityManagerInterface $em)
         {
             // These methods also return the default entity manager, but it's preferred
-            // to get it by inyecting EntityManagerInterface in the action method
+            // to get it by injecting EntityManagerInterface in the action method
             $em = $this->getDoctrine()->getManager();
             $em = $this->getDoctrine()->getManager('default');
             $em = $this->get('doctrine.orm.default_entity_manager');

doctrine/pdo_session_storage.rst

@@ -70,23 +70,23 @@ Next, tell Symfony to use your service as the session handler:
 
     .. code-block:: yaml
 
-        # config/packages/doctrine.yaml
+        # config/packages/framework.yaml
         framework:
             session:
                 # ...
                 handler_id: Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler
 
     .. code-block:: xml
 
-        <!-- config/packages/doctrine.xml -->
+        <!-- config/packages/framework.xml -->
         <framework:config>
             <!-- ... -->
             <framework:session handler-id="Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler" cookie-lifetime="3600" auto-start="true"/>
         </framework:config>
 
     .. code-block:: php
 
-        // config/packages/doctrine.php
+        // config/packages/framework.php
         use Symfony\Component\HttpFoundation\Session\Storage\Handler\PdoSessionHandler;
 
         // ...