Merge branch '3.4' into 4.0

* 3.4:
  Fix passing arguments to "Client" constructor
  Revert back to SF 3 directory structure

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);

frontend/encore/versioning.rst

@@ -16,7 +16,7 @@ ignoring any existing cache:
     // ...
 
     Encore
-        .setOutputPath('public/build/')
+        .setOutputPath('web/build/')
         // ...
     +     .enableVersioning()
 
@@ -49,7 +49,7 @@ in your ``script`` and ``link`` tags. If you're using Symfony, just activate the
         # ...
         assets:
             # feature is supported in Symfony 3.3 and higher
-            json_manifest_path: '%kernel.project_dir%/public/build/manifest.json'
+            json_manifest_path: '%kernel.project_dir%/web/build/manifest.json'
 
 That's it! Just be sure to wrap each path in the Twig ``asset()`` function
 like normal: