Merge branch '2.0'

weaverryan · weaverryan · commit 61f74f8b4125 · 2012-04-02T21:40:57.000-05:00
Conflicts:
	reference/constraints/UniqueEntity.rst
diff --git a/reference/constraints/UniqueEntity.rst b/reference/constraints/UniqueEntity.rst
@@ -1,9 +1,9 @@
 UniqueEntity
 ============
 
-Validates that a particular field (or fields) in a Doctrine entity are unique.
-This is commonly used, for example, to prevent a new user to register using
-an email address that already exists in the system.
+Validates that a particular field (or fields) in a Doctrine entity is (are)
+unique. This is commonly used, for example, to prevent a new user to register
+using an email address that already exists in the system.
 
 +----------------+-------------------------------------------------------------------------------------+
 | Applies to     | :ref:`class<validation-class-target>`                                               |
@@ -20,9 +20,10 @@ an email address that already exists in the system.
 Basic Usage
 -----------
 
-Suppose you have an ``AcmeUserBundle`` with a ``User`` entity that has an
-``email`` field. You can use the ``Unique`` constraint to guarantee that the
-``email`` field remains unique between all of the constrains in your user table:
+Suppose you have an ``AcmeUserBundle`` bundle with a ``User`` entity that has an
+``email`` field. You can use the ``UniqueEntity`` constraint to guarantee that
+the ``email`` field remains unique between all of the constraints in your user
+table:
 
 .. configuration-block::
 
@@ -84,21 +85,21 @@ fields
 
 This required option is the field (or list of fields) on which this entity
 should be unique. For example, you could specify that both the email and
-name fields in the User example above should be unique.
+name fields in the ``User`` example above should be unique.
 
 message
 ~~~~~~~
 
 **type**: ``string`` **default**: ``This value is already used.``
 
-The message that's displayed with this constraint fails.
+The message that's displayed when this constraint fails.
 
 em
 ~~
 
 **type**: ``string``
 
 The name of the entity manager to use for making the query to determine the
-uniqueness. If left blank, the correct entity manager will determined for
+uniqueness. If it's left blank, the correct entity manager will determined for
 this class. For that reason, this option should probably not need to be
 used.
