Merge branch '3.4' into 4.2

* 3.4:
  regroup some constraints
  typo in comment (php example)

Author: wouterj

reference/constraints/map.rst.inc

@@ -21,6 +21,7 @@ String Constraints
 * :doc:`Regex </reference/constraints/Regex>`
 * :doc:`Ip </reference/constraints/Ip>`
 * :doc:`Uuid</reference/constraints/Uuid>`
+* :doc:`UserPassword </reference/constraints/UserPassword>`
 
 Comparison Constraints
 ~~~~~~~~~~~~~~~~~~~~~~
@@ -43,13 +44,10 @@ Date Constraints
 * :doc:`DateTime </reference/constraints/DateTime>`
 * :doc:`Time </reference/constraints/Time>`
 
-Collection Constraints
-~~~~~~~~~~~~~~~~~~~~~~
+Choice Constraints
+~~~~~~~~~~~~~~~~~~
 
 * :doc:`Choice </reference/constraints/Choice>`
-* :doc:`Collection </reference/constraints/Collection>`
-* :doc:`Count </reference/constraints/Count>`
-* :doc:`UniqueEntity </reference/constraints/UniqueEntity>`
 * :doc:`Language </reference/constraints/Language>`
 * :doc:`Locale </reference/constraints/Locale>`
 * :doc:`Country </reference/constraints/Country>`
@@ -77,5 +75,7 @@ Other Constraints
 * :doc:`Callback </reference/constraints/Callback>`
 * :doc:`Expression </reference/constraints/Expression>`
 * :doc:`All </reference/constraints/All>`
-* :doc:`UserPassword </reference/constraints/UserPassword>`
 * :doc:`Valid </reference/constraints/Valid>`
+* :doc:`Collection </reference/constraints/Collection>`
+* :doc:`Count </reference/constraints/Count>`
+* :doc:`UniqueEntity </reference/constraints/UniqueEntity>`