Merge pull request symfony#1479 from nomack84/form_fixes

weaverryan · weaverryan · commit cb79c958907e · 2012-07-02T20:10:19.000-07:00
[Form]Some form fixes
diff --git a/book/forms.rst b/book/forms.rst
@@ -1550,7 +1550,7 @@ but here's a short example::
     ;
 
 Now, when you call `$form->bindRequest($request)`, the constraints setup here are run
-against your form's data. If you're using a form class, override the ``getDefaultOptions``
+against your form's data. If you're using a form class, override the ``setDefaultOptions()``
 method to specify the option::
 
     namespace Acme\TaskBundle\Form\Type;
diff --git a/cookbook/form/create_custom_field_type.rst b/cookbook/form/create_custom_field_type.rst
@@ -70,17 +70,17 @@ important:
   set) the ``multiple`` attribute on the ``select`` field. See `Creating a Template for the Field`_
   for more details.
 
-* ``getDefaultOptions()`` - This defines options for your form type that
+* ``setDefaultOptions()`` - This defines options for your form type that
   can be used in ``buildForm()`` and ``buildView()``. There are a lot of
-  options common to all fields (see `FieldType`_), but you can create any
+  options common to all fields (see `FormType`_), but you can create any
   others that you need here.
 
 .. tip::
 
     If you're creating a field that consists of many fields, then be sure
     to set your "parent" type as ``form`` or something that extends ``form``.
     Also, if you need to modify the "view" of any of your child types from
-    your parent type, use the ``buildViewBottomUp()`` method.
+    your parent type, use the ``finishView()`` method.
 
 The ``getName()`` method returns an identifier which should be unique in
 your application. This is used in various places, such as when customizing
diff --git a/cookbook/form/use_virtuals_forms.rst b/cookbook/form/use_virtuals_forms.rst
@@ -113,7 +113,7 @@ But we absolutely want to have a dedicated form type to deal with location (reme
 
 The ``virtual`` form field option is the solution.
 
-We can set the option ``'virtual' => true`` in the ``getDefaultOptions`` method
+We can set the option ``'virtual' => true`` in the ``setDefaultOptions()`` method
 of ``LocationType`` and directly start using it in the two original form types.
 
 Look at the result::

Original file line number	Diff line number	Diff line change
`@@ -1550,7 +1550,7 @@ but here's a short example::`
`1550`	`1550`	`;`
`1551`	`1551`
`1552`	`1552`	Now, when you call `$form->bindRequest($request)`, the constraints setup here are run
`1553`		-against your form's data. If you're using a form class, override the ``getDefaultOptions``
	`1553`	+against your form's data. If you're using a form class, override the ``setDefaultOptions()``
`1554`	`1554`	`method to specify the option::`
`1555`	`1555`
`1556`	`1556`	`namespace Acme\TaskBundle\Form\Type;`