Merge branch '2.1' into 2.2

weaverryan · weaverryan · commit f962e9af8a58 · 2013-05-18T17:03:55.000-05:00
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -138,7 +138,7 @@ Extract attribute and/or node values from the list of nodes::
 Call an anonymous function on each node of the list::
 
     $nodeValues = $crawler->filter('p')->each(function ($node, $i) {
-        return $node->nodeValue;
+        return $node->text();
     });
 
 The anonymous function receives the position and the node as arguments.
diff --git a/cookbook/configuration/front_controllers_and_kernel.rst b/cookbook/configuration/front_controllers_and_kernel.rst
@@ -40,7 +40,7 @@ and return the resulting response to the browser.
 
 Because every request is routed through it, the front controller can be
 used to perform global initializations prior to setting up the kernel or
-to *`decorate`_* the kernel with additional features. Examples include:
+to `decorate`_ the kernel with additional features. Examples include:
 
 * Configuring the autoloader or adding additional autoloading mechanisms;
 * Adding HTTP level caching by wrapping the kernel with an instance of
diff --git a/cookbook/security/voters.rst b/cookbook/security/voters.rst
@@ -4,10 +4,10 @@
 How to implement your own Voter to blacklist IP Addresses
 =========================================================
 
-The Symfony2 security component provides several layers to authenticate users.
+The Symfony2 security component provides several layers to authorize users.
 One of the layers is called a `voter`. A voter is a dedicated class that checks
 if the user has the rights to be connected to the application. For instance,
-Symfony2 provides a layer that checks if the user is fully authenticated or if
+Symfony2 provides a layer that checks if the user is fully authorized or if
 it has some expected roles.
 
 It is sometimes useful to create a custom voter to handle a specific case not
