[#3191] Many tweaks to expression language component thanks to @wouterj, @xabbuh and @cordoval. Thanks guys!

weaverryan · weaverryan · commit a14c39d530eb · 2013-11-28T11:17:39.000-06:00
diff --git a/components/expression_language/introduction.rst b/components/expression_language/introduction.rst
@@ -10,22 +10,22 @@ The ExpressionLanguage Component
     (mostly, but not limited to, Booleans).
 
 .. versionadded:: 2.4
-    The ExpressionLanguage component was added in Symfony 2.4.
+    The ExpressionLanguage component was introduced in Symfony 2.4.
 
 Installation
 ------------
 
 You can install the component in 2 different ways:
 
-* :doc:`Install it via Composer </components/using_components>` (``symfony/expression-language`` on `Packagist`_).
-* Use the official Git repository (https://github.com/symfony/expression-language);
+* :doc:`Install it via Composer </components/using_components>` (``symfony/expression-language`` on `Packagist`_);
+* Use the official Git repository (https://github.com/symfony/expression-language).
 
 How can the Expression Engine Help Me?
 --------------------------------------
 
 The purpose of the component is to allow users to use expressions inside
-configuration for more complex logic. In the Symfony2 Framework, for example,
-expressions can be used in security, for validation rules, and in route matching.
+configuration for more complex logic. For some examples, the Symfony2 Framework
+uses expressions in security, for validation rules and in route matching.
 
 Besides using the component in the framework itself, the ExpressionLanguage
 component is a perfect candidate for the foundation of a *business rule engine*.
@@ -52,15 +52,15 @@ Usage
 
 The ExpressionLanguage component can compile and evaluate expressions.
 Expressions are one-liners that often return a Boolean, which can be used
-by the code executing the expression in an ``if`` statements. A simple example
+by the code executing the expression in an ``if`` statement. A simple example
 of an expression is ``1 + 2``. You can also use more complicated expressions,
 such as ``someArray[3].someMethod('bar')``.
 
 The component provides 2 ways to work with expressions:
 
+* **evaluation**: the expression is evaluated without being compiled to PHP;
 * **compile**: the expression is compiled to PHP, so it can be cached and
-  evaluated;
-* **evaluation**: the expression is evaluated without being compiled to PHP.
+  evaluated.
 
 The main class of the component is
 :class:`Symfony\\Component\\ExpressionLanguage\\ExpressionLanguage`::
diff --git a/components/expression_language/syntax.rst b/components/expression_language/syntax.rst
@@ -49,6 +49,8 @@ to JavaScript::
         )
     );
 
+This will print ``Honeycrisp``;
+
 Calling Methods
 ~~~~~~~~~~~~~~~
 
@@ -77,7 +79,7 @@ JavaScript::
         )
     );
 
-This will print "Hi Hi Hi!";
+This will print ``Hi Hi Hi!``.
 
 .. _component-expression-arrays:
 
@@ -178,7 +180,7 @@ Examples::
         )
     );
 
-These would both return ``false``.
+Both variables would be set to ``false``.
 
 Logical Operators
 ~~~~~~~~~~~~~~~~~
@@ -198,7 +200,7 @@ For example::
         )
     );
 
-This would return ``true``.
+This ``$ret`` variable will be set to ``true``.
 
 String Operators
 ~~~~~~~~~~~~~~~~
@@ -207,7 +209,7 @@ String Operators
 
 For example::
 
-    $ret4 = $language->evaluate(
+    echo $language->evaluate(
         'firstName~" "~lastName',
         array(
             'firstName' => 'Arthur',
@@ -233,13 +235,15 @@ For example::
     $user = new User();
     $user->group = 'human_resources';
 
-    $ret5 = $language->evaluate(
+    $inGroup = $language->evaluate(
         'user.group in ["human_resources", "marketing"]',
         array(
             'user' => $user
         )
     );
 
+The ``$inGroup`` would evaluate to ``true``.
+
 Numeric Operators
 ~~~~~~~~~~~~~~~~~
 
