Merge branch '2.3' into 2.7

wouterj · wouterj · commit ec522d93f2e0 · 2015-08-23T16:57:08.000+02:00
Conflicts:
	components/config/definition.rst
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
 /_build
-/_exts
 *.pyc
diff --git a/book/doctrine.rst b/book/doctrine.rst
@@ -766,8 +766,10 @@ covered later), group, etc. For more information, see the official
 Querying for Objects Using Doctrine's Query Builder
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Instead of writing a DQL string, you can alternatively use a helpful object called
-the ``QueryBuilder`` to build that string for you::
+Instead of writing a DQL string, you can use a helpful object called the
+``QueryBuilder`` to build that string for you. This is useful when the actual query
+depends on dynamic conditions, as your code soon becomes hard to read with
+DQL as you start to concatenate strings::
 
     $repository = $this->getDoctrine()
         ->getRepository('AppBundle:Product');
diff --git a/book/page_creation.rst b/book/page_creation.rst
@@ -181,7 +181,7 @@ at the end:
             }
 
             // ...
-        }        
+        }
 
     .. code-block:: yaml
 
@@ -272,7 +272,7 @@ easy, powerful and actually quite fun.
 So far, ``LuckyController`` doesn't extend any base class. The easiest way
 to use Twig - or many other tools in Symfony - is to extend Symfony's base
 :class:`Symfony\\Bundle\\FrameworkBundle\\Controller\\Controller` class::
-    
+
     // src/AppBundle/Controller/LuckyController.php
     // ...
 
@@ -566,9 +566,9 @@ Ok, time to finish mastering the fundamentals by reading these chapters:
 * :doc:`/book/routing`
 * :doc:`/book/templating`
 
-Then, learn about Symfony's :doc:`service container </book/service_container>`
+Then, in the :doc:`Symfony Book </book/index>`, learn about the :doc:`service container </book/service_container>`,
 the :doc:`form system </book/forms>`, using :doc:`Doctrine </book/doctrine>`
-if you need to query a database and more. in the :doc:`Symfony Book </book/index>`.
+(if you need to query a database) and more!
 
 There's also a :doc:`Cookbook </cookbook/index>` *packed* with more advanced
 "how to" articles to solve *a lot* of problems.
diff --git a/components/config/definition.rst b/components/config/definition.rst
@@ -295,7 +295,7 @@ All options can be documented using the
 method.
 
 The info will be printed as a comment when dumping the configuration tree
-with the ``config:dump`` command.
+with the ``config:dump-reference`` command.
 
 .. versionadded:: 2.6
     Since Symfony 2.6, the info will also be added to the exception message
diff --git a/reference/twig_reference.rst b/reference/twig_reference.rst
@@ -418,7 +418,12 @@ humanize
     **type**: ``string``
 
 Makes a technical name human readable (i.e. replaces underscores by spaces
-and capitalizes the string).
+or transforms camelCase text like ``helloWorld`` to ``hello world``
+and then capitalizes the string).
+
+.. versionadded:: 2.3
+    Transforming camelCase text into human readable text was introduced in
+    Symfony 2.3.
 
 trans
 ~~~~~
