[symfony#2694] Fixing some formatting issues and some minor proofreading for new error_mapping docs

weaverryan · weaverryan · commit 7ae32e22b69d · 2013-06-22T15:03:56.000-05:00
diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
@@ -346,7 +346,7 @@ Not all options are listed here - only the most applicable to this type:
 
 .. include:: /reference/forms/types/options/mapped.rst.inc
 
-.. include:: /reference/forms/types/options/_error_mapping.rst.inc
+.. include:: /reference/forms/types/options/error_mapping.rst.inc
 
 error_bubbling
 ~~~~~~~~~~~~~~
diff --git a/reference/forms/types/options/error_mapping.rst.inc b/reference/forms/types/options/error_mapping.rst.inc
@@ -6,28 +6,35 @@ error_mapping
 
 **type**: ``array`` **default**: ``empty``
 
-This option permits to modify the default target of errors.
-
-Imagine a custom method named ``matchingCityAndZipCode`` validates 
-whether the city and zip code matches.
-Unfortunately, there is no "matchingCityAndZipCode" field in your form, 
-so all that Symfony can do for you is display the error on top of the form. 
-
-With customized error mapping, you can do better: 
-make the error be mapped to the city field.
-
-Here are the rules to understand the left and the right side of the mapping:
-
- * The left side contains property paths. 
- * If the violation is generated on a property or method of a class, 
- its path is simply propertyName. 
- * If the violation is generated on an entry of an ``array`` 
- or ``ArrayAccess`` object, the property path is ``[indexName]``. 
- * You can construct nested property paths by concatenating them, 
- separating properties by dots, 
-   * for example: ``addresses[work].matchingCityAndZipCode``
- * The left side of the error mapping also accepts a dot ``.``,
- which refers to the field itself. 
- That means that any error added to the field is added to the given 
- nested field instead.
- * The right side contains simply the names of fields in the form.
+This option allows you to modify the target of a validation error.
+
+Imagine you have a custom method named ``matchingCityAndZipCode`` that validates
+whether the city and zip code match. Unfortunately, there is no "matchingCityAndZipCode" 
+field in your form, so all that Symfony can do is display the error on top
+of the form.
+
+With customized error mapping, you can do better: map the error to the city
+field so that it displays above it::
+
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults(array(
+            'error_mapping' => array(
+                'matchingCityAndZipCode' => 'city',
+            ),
+        ));
+    }
+
+Here are the rules for the left and the right side of the mapping:
+
+* The left side contains property paths.
+* If the violation is generated on a property or method of a class, its path
+  is simply "propertyName".
+* If the violation is generated on an entry of an ``array`` or ``ArrayAccess``
+  object, the property path is ``[indexName]``.
+* You can construct nested property paths by concatenating them, separating
+  properties by dots. For example: ``addresses[work].matchingCityAndZipCode``
+* The left side of the error mapping also accepts a dot ``.``, which refers
+  to the field itself. That means that any error added to the field is added
+  to the given nested field instead.
+* The right side contains simply the names of fields in the form.
