[#3022][#3258] Tweaks thanks to @cordoval

weaverryan · weaverryan · commit 0cf18287b2f8 · 2013-12-01T18:49:45.000-05:00
diff --git a/book/routing.rst b/book/routing.rst
@@ -728,7 +728,7 @@ Completely Customized Route Matching with Conditions
 
 As you've seen, a route can be made to match only certain routing wildcards
 (via regular expressions), HTTP methods, or host names. But the routing system
-can be extended to almost an infinite flexibility with ``conditions``:
+can be extended to have an almost infinite flexibility using ``conditions``:
 
 .. configuration-block::
 
@@ -775,13 +775,13 @@ can be extended to almost an infinite flexibility with ``conditions``:
 
         return $collection;
 
-The ``condition`` is an expression, and you can learn more about it syntax
+The ``condition`` is an expression, and you can learn more about its syntax
 here: :doc:`/components/expression_language/syntax`. With this, the route
 won't match unless the HTTP method is either GET or HEAD *and* if the ``User-Agent``
 header matches ``firefox``.
 
-You can do any complex logic you need here by leveraging two variables that
-are passed into the expression:
+You can do any complex logic you need in the expression by leveraging two
+variables that are passed into the expression:
 
 * ``context``: An instance of :class:`Symfony\\Component\\Routing\\RequestContext`,
   which holds the most fundamental information about the route being matched;
@@ -804,7 +804,7 @@ are passed into the expression:
             // ...
         }
 
-    Because of this, using the ``condition`` key causes no extra roverhead
+    Because of this, using the ``condition`` key causes no extra overhead
     beyond the time it takes for the underlying PHP to execute.
 
 .. index::
diff --git a/book/security.rst b/book/security.rst
@@ -1981,7 +1981,7 @@ Inside the expression, you have access to a number of variables:
   ``isGranted`` ;
 * ``token`` The token object;
 * ``trust_resolver``: The :class:`Symfony\\Component\\Security\\Core\\Authentication\\AuthenticationTrustResolverInterface`,
-   object: probably not useful directly.
+   object: you'll probably use the ``is_*`` functions below instead.
 
 Additionally, you have access to a number of functions inside the expression.
 **Note**: some of these functions *look* similar to the ``IS_AUTHENTICATED_*``
@@ -2018,7 +2018,7 @@ attributes, but work differently. See the note below:
     Here, ``$access1`` and ``$access2`` will be the same value. Unlike the
     behavior of ``IS_AUTHENTICATED_REMEMBERED`` and ``IS_AUTHENTICATED_FULLY``,
     the ``is_remember_me`` function *only* returns true if the user is authenticated
-    via a remember me cookie and ``is_fully_authenticated`` *only* returns
+    via a remember-me cookie and ``is_fully_authenticated`` *only* returns
     true if the user has actually logged in during this session (i.e. is
     full-fledged).
 
diff --git a/cookbook/expression/expressions.rst b/cookbook/expression/expressions.rst
@@ -21,4 +21,4 @@ ways:
 * :doc:`Validation </reference/constraints/Expression>`.
 
 For more information about how to create and work with expressions, see
-:doc:`/components/expression_language/syntax`.
+:doc:`/components/expression_language/syntax`.
diff --git a/reference/constraints/Expression.rst b/reference/constraints/Expression.rst
@@ -130,7 +130,7 @@ expression that must return true in order for validation to pass. To learn
 more about the expression language syntax, see
 :doc:`/components/expression_language/syntax`.
 
-For more information about the expression and what variables you have available
+For more information about the expression and what variables are available
 to you, see the :ref:`expression <reference-constraint-expression-option>`
 option details below.
 
