Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit 69405f9e1160 · 2013-09-18T10:18:47.000-05:00
diff --git a/reference/constraints/Country.rst b/reference/constraints/Country.rst
@@ -24,7 +24,7 @@ Basic Usage
         Acme\UserBundle\Entity\User:
             properties:
                 country:
-                    - Country:
+                    - Country: ~
 
     .. code-block:: php-annotations
 
