This reverts an improper merge - master was merged into 2.1 by mistake.

This fixes that bad merge. I'll then merge this upstream to master (which is normal),
which will undo these changes (improperly) on master. To fix that, I'll revert
this revert.

Revert "Merge branch 'master' into 2.1"

This reverts commit 5b7f8fb, reversing
changes made to 4a9d6a0.

Author: weaverryan

book/installation.rst

@@ -60,11 +60,11 @@ Distribution:
 
 .. code-block:: bash
 
-    php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony dev-master
+    php composer.phar create-project symfony/framework-standard-edition /path/to/webroot/Symfony 2.1.x-dev
 
 .. tip::
 
-    For an exact version, replace `dev-master` with the latest Symfony version
+    For an exact version, replace `2.1.x-dev` with the latest Symfony version
     (e.g. 2.1.1). For details, see the `Symfony Installation Page`_
 
 This command may take several minutes to run as Composer download the Standard

book/testing.rst

@@ -415,19 +415,13 @@ HTTP layer. For a list of services available in your application, use the
 Accessing the Profiler Data
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-On each request, you can enable the Symfony profiler to collect data about the
-internal handling of that request. For example, the profiler could be used to
-verify that a given page executes less than a certain number of database
+On each request, the Symfony profiler collects and stores a lot of data about
+the internal handling of that request. For example, the profiler could be
+used to verify that a given page executes less than a certain number of database
 queries when loading.
 
 To get the Profiler for the last request, do the following::
 
-    // enable the profiler for the very next request
-    $client->enableProfiler();
-
-    $crawler = $client->request('GET', '/profiler');
-
-    // get the profile
     $profile = $client->getProfile();
 
 For specific details on using the profiler inside a test, see the

cookbook/testing/profiling.rst

@@ -11,19 +11,15 @@ various things and enforce some metrics.
 
 The Symfony2 :ref:`Profiler <internals-profiler>` gathers a lot of data for
 each request. Use this data to check the number of database calls, the time
-spent in the framework, ... But before writing assertions, enable the profiler
-and check that the profiler is indeed available (it is enabled by default in
-the ``test`` environment)::
+spent in the framework, ... But before writing assertions, always check that
+the profiler is indeed available (it is enabled by default in the ``test``
+environment)::
 
     class HelloControllerTest extends WebTestCase
     {
         public function testIndex()
         {
             $client = static::createClient();
-
-            // Enable the profiler for the next request (it does nothing if the profiler is not available)
-            $client->enableProfiler();
-
             $crawler = $client->request('GET', '/hello/Fabien');
 
             // ... write some assertions about the Response

quick_tour/the_big_picture.rst

@@ -59,12 +59,12 @@ have a ``Symfony/`` directory that looks like this:
 
     .. code-block:: bash
 
-        $ composer.phar create-project symfony/framework-standard-edition path/to/install dev-master
+        $ composer.phar create-project symfony/framework-standard-edition path/to/install 2.1.x-dev
 
         # remove the Git history
         $ rm -rf .git
     
-    For an exact version, replace `dev-master` with the latest Symfony version
+    For an exact version, replace `2.1.x-dev` with the latest Symfony version
     (e.g. 2.1.1). For details, see the `Symfony Installation Page`_
 
 .. tip::

reference/constraints.rst

@@ -40,16 +40,14 @@ Validation Constraints Reference
    constraints/File
    constraints/Image
 
-   constraints/Luhn
-
    constraints/Callback
    constraints/All
    constraints/UserPassword
    constraints/Valid
 
 The Validator is designed to validate objects against *constraints*.
 In real life, a constraint could be: "The cake must not be burned". In
-Symfony2, constraints are similar: They are assertions that a condition is
+Symfony2, constraints are similar: They are assertions that a condition is 
 true.
 
 Supported Constraints

reference/constraints/Luhn.rst

@@ -54,11 +54,6 @@ File Constraints
 * :doc:`File </reference/constraints/File>`
 * :doc:`Image </reference/constraints/Image>`
 
-Financial Constraints
-~~~~~~~~~~~~~~~~~~~~~
-
-* :doc:`Luhn </reference/constraints/Luhn>`
-
 Other Constraints
 ~~~~~~~~~~~~~~~~~