Merge branch '2.8' into 3.3

* 2.8:
  adding note to config
  Add "url" key in dbal configuration
  Update database.rst
  Fix docs about making external requests with BrowserKit

Author: weaverryan

components/browser_kit.rst

@@ -8,6 +8,12 @@ The BrowserKit Component
     The BrowserKit component simulates the behavior of a web browser, allowing
     you to make requests, click on links and submit forms programmatically.
 
+.. note::
+
+    The BrowserKit component can only make internal requests to your application.
+    If you need to make requests to external sites and applications, consider
+    using `Goutte`_, a simple web scraper based on Symfony Components.
+
 Installation
 ------------
 
@@ -60,7 +66,7 @@ URL::
     use Acme\Client;
 
     $client = new Client();
-    $crawler = $client->request('GET', 'http://symfony.com');
+    $crawler = $client->request('GET', '/');
 
 The value returned by the ``request()`` method is an instance of the
 :class:`Symfony\\Component\\DomCrawler\\Crawler` class, provided by the
@@ -78,7 +84,7 @@ performs the needed HTTP GET request to simulate the link click::
     use Acme\Client;
 
     $client = new Client();
-    $crawler = $client->request('GET', 'http://symfony.com');
+    $crawler = $client->request('GET', '/product/123');
     $link = $crawler->selectLink('Go elsewhere...')->link();
     $client->click($link);
 
@@ -120,7 +126,7 @@ retrieve any cookie while making requests with the client::
 
     // Make a request
     $client = new Client();
-    $crawler = $client->request('GET', 'http://symfony.com');
+    $crawler = $client->request('GET', '/');
 
     // Get the cookie Jar
     $cookieJar = $client->getCookieJar();
@@ -153,7 +159,7 @@ Looping Through Cookies
 
     // Make a request
     $client = new Client();
-    $crawler = $client->request('GET', 'http://symfony.com');
+    $crawler = $client->request('GET', '/');
 
     // Get the cookie Jar
     $cookieJar = $client->getCookieJar();
@@ -199,9 +205,8 @@ history::
 
     use Acme\Client;
 
-    // make a real request to an external site
     $client = new Client();
-    $client->request('GET', 'http://symfony.com');
+    $client->request('GET', '/');
 
     // select and click on a link
     $link = $crawler->selectLink('Documentation')->link();
@@ -218,9 +223,8 @@ also delete all the cookies::
 
     use Acme\Client;
 
-    // make a real request to an external site
     $client = new Client();
-    $client->request('GET', 'http://symfony.com');
+    $client->request('GET', '/');
 
     // delete history
     $client->restart();

reference/configuration/doctrine.rst

@@ -300,6 +300,8 @@ The following block shows all possible configuration keys:
                 user:                 user
                 password:             secret
                 driver:               pdo_mysql
+                # if the url option is specified, it will override the above config
+                url:                  mysql://db_user:db_password@127.0.0.1:3306/db_name 
                 # the DBAL driverClass option
                 driver_class:         MyNamespace\MyDriverImpl
                 # the DBAL driverOptions option

testing/database.rst

@@ -6,7 +6,7 @@ How to Test Code that Interacts with the Database
 
 If your code interacts with the database, e.g. reads data from or stores data
 into it, you need to adjust your tests to take this into account. There are
-many ways how to deal with this. In a unit test, you can create a mock for
+many ways to deal with this. In a unit test, you can create a mock for
 a ``Repository`` and use it to return expected objects. In a functional test,
 you may need to prepare a test database with predefined values to ensure that
 your test always has the same data to work with.