Merge branch '2.0' into 2.1

Author: weaverryan

reference/constraints/All.rst

@@ -69,7 +69,7 @@ entry in that array:
 
     .. code-block:: php
 
-        // src/Acme/UserBundle/Enttiy/User.php
+        // src/Acme/UserBundle/Entity/User.php
         namespace Acme\UserBundle\Entity;
        
         use Symfony\Component\Validator\Mapping\ClassMetadata;