Merge remote-tracking branch 'origin/2.2' into 2.2

weaverryan · weaverryan · commit 85a6d227f012 · 2013-05-03T23:47:45.000-06:00
diff --git a/reference/constraints/CardScheme.rst b/reference/constraints/CardScheme.rst
@@ -35,7 +35,7 @@ on an  object that will contain a credit card number.
                 cardNumber:
                     - CardScheme:
                         schemes: [VISA]
-                        message: You credit card number is invalid.
+                        message: Your credit card number is invalid.
 
     .. code-block:: xml
 
@@ -46,7 +46,7 @@ on an  object that will contain a credit card number.
                     <option name="schemes">
                         <value>VISA</value>
                     </option>
-                    <option name="message">You credit card number is invalid.</option>
+                    <option name="message">Your credit card number is invalid.</option>
                 </constraint>
             </property>
         </class>
@@ -61,7 +61,7 @@ on an  object that will contain a credit card number.
         class Transaction
         {
             /**
-             * @Assert\CardScheme(schemes = {"VISA"}, message = "You credit card number is invalid.")
+             * @Assert\CardScheme(schemes = {"VISA"}, message = "Your credit card number is invalid.")
              */
             protected $cardNumber;
         }
@@ -84,7 +84,7 @@ on an  object that will contain a credit card number.
                     'schemes' => array(
                         'VISA'
                     ),
-                    'message' => 'You credit card number is invalid.',
+                    'message' => 'Your credit card number is invalid.',
                 )));
             }
         }
diff --git a/reference/constraints/UserPassword.rst b/reference/constraints/UserPassword.rst
@@ -6,11 +6,11 @@ UserPassword
 
 .. note::
 
-    Since Symfony 2.2, the `UserPassword*` classes in the
-    `Symfony\Component\Security\Core\Validator\Constraint` namespace are
+    Since Symfony 2.2, the ``UserPassword*`` classes in the
+    ``Symfony\\Component\\Security\\Core\\Validator\\Constraint`` namespace are
     deprecated and will be removed in Symfony 2.3. Please use the
-    `UserPassword*` classes in the
-    `Symfony\Component\Security\Core\Validator\Constraints` namespace instead.
+    ``UserPassword*`` classes in the
+    ``Symfony\\Component\\Security\\Core\\Validator\\Constraints`` namespace instead.
 
 This validates that an input value is equal to the current authenticated
 user's password. This is useful in a form where a user can change his password,
