Merge branch '2.2' into 2.3

weaverryan · weaverryan · commit a847786cf03b · 2013-12-26T14:21:41.000-05:00
diff --git a/book/validation.rst b/book/validation.rst
@@ -115,7 +115,7 @@ The job of the ``validator`` is easy: to read the constraints (i.e. rules)
 of a class and verify whether or not the data on the object satisfies those
 constraints. If validation fails, a non-empty list of errors
 (class :class:`Symfony\\Component\\Validator\\ConstraintViolationList`) is
-returned. Take this simple example from inside a controller:
+returned. Take this simple example from inside a controller::
 
     // ...
     use Symfony\Component\HttpFoundation\Response;
