[symfony#3241] Minor tweaks to new expression language functions

weaverryan · weaverryan · commit 667d590d1492 · 2013-11-29T16:56:02.000-05:00
diff --git a/components/expression_language/extending.rst b/components/expression_language/extending.rst
@@ -5,18 +5,18 @@ Extending the ExpressionLanguage
 ================================
 
 The ExpressionLanguage can be extended by adding custom functions. For
-instance, in the framework, the security has custom functions to check the
-user's role.
+instance, in the Symfony Framework, the security has custom functions to check
+the user's role.
 
 .. note::
 
     If you want to learn how to use functions in an expression, read
     ":ref:`component-expression-functions`".
 
-Register Functions
-------------------
+Registering Functions
+---------------------
 
-Functions will be registered on the current ``ExpressionLanguage`` instance.
+Functions are registered on each specific ``ExpressionLanguage`` instance.
 That means the functions can be used in any expression executed by that
 instance.
 
@@ -52,13 +52,12 @@ This method has 3 arguments:
 
 This will print ``hello``.
 
-Creating a new ExpressionLanguage class
+Creating a new ExpressionLanguage Class
 ---------------------------------------
 
 When you use the ``ExpressionLanguage`` class in your library, it's recommend
 to create a new ``ExpressionLanguage`` class and register the functions there.
-The class will execute ``registerFunctions`` to register the default
-functions, you can override this to also add your own functions::
+Override ``registerFunctions`` to add your own functions::
 
     namespace Acme\AwesomeLib\ExpressionLanguage;
 
diff --git a/components/expression_language/syntax.rst b/components/expression_language/syntax.rst
@@ -88,7 +88,7 @@ Working with Functions
 
 You can also use registered functions in the expression by using the same
 syntax as PHP and JavaScript. The ExpressionLanguage component comes with one
-function by default: ``constant()`` Which will return the value of the PHP
+function by default: ``constant()``, which will return the value of the PHP
 constant::
 
     define('DB_USER', 'root');
@@ -101,7 +101,7 @@ This will print ``root``.
 
 .. tip::
 
-    To read how to register your own function to use in an expression, see
+    To read how to register your own functions to use in an expression, see
     ":doc:`/components/expression_language/extending`".
 
 .. _component-expression-arrays:
@@ -285,7 +285,7 @@ For example::
     );
 
 This will evaluate to ``true``, because ``user.age`` is in the range from
-``18`` till ``45``
+``18`` to ``45``.
 
 Ternary Operators
 ~~~~~~~~~~~~~~~~~
