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

weaverryan · weaverryan · commit ea981e7286bb · 2013-01-27T11:46:54.000-08:00
diff --git a/book/forms.rst b/book/forms.rst
@@ -1517,7 +1517,7 @@ Learn more from the Cookbook
 * :doc:`File Field Reference </reference/forms/types/file>`
 * :doc:`Creating Custom Field Types </cookbook/form/create_custom_field_type>`
 * :doc:`/cookbook/form/form_customization`
-* :doc:`/cookbook/form/dynamic_form_generation`
+* :doc:`/cookbook/form/dynamic_form_modification`
 * :doc:`/cookbook/form/data_transformers`
 
 .. _`Symfony2 Form Component`: https://github.com/symfony/Form
diff --git a/book/installation.rst b/book/installation.rst
@@ -119,7 +119,7 @@ If there are any issues, correct them now before moving on.
 
     **Note that not all web servers run as the user** ``www-data`` as in the examples
     below. Instead, check which user *your* web server is being run as and
-    use it place of ``www-data``.
+    use it in place of ``www-data``.
 
     On a UNIX system, this can be done with one of the following commands:
 
diff --git a/cookbook/form/dynamic_form_modification.rst b/cookbook/form/dynamic_form_modification.rst
@@ -1,7 +1,7 @@
 .. index::
    single: Form; Events
 
-How to Dynamically Generate Forms Using Form Events
+How to Dynamically Modify Forms Using Form Events
 ===================================================
 
 Before jumping right into dynamic form generation, let's have a quick review
diff --git a/cookbook/form/index.rst b/cookbook/form/index.rst
@@ -6,7 +6,7 @@ Form
 
     form_customization
     data_transformers
-    dynamic_form_generation
+    dynamic_form_modification
     form_collections
     create_custom_field_type
     create_form_type_extension
diff --git a/cookbook/map.rst.inc b/cookbook/map.rst.inc
@@ -74,7 +74,7 @@
 
   * :doc:`/cookbook/form/form_customization`
   * :doc:`/cookbook/form/data_transformers`
-  * :doc:`/cookbook/form/dynamic_form_generation`
+  * :doc:`/cookbook/form/dynamic_form_modification`
   * :doc:`/cookbook/form/form_collections`
   * :doc:`/cookbook/form/create_custom_field_type`
   * :doc:`/cookbook/form/create_form_type_extension`
diff --git a/redirection_map b/redirection_map
@@ -1,6 +1,7 @@
 /cookbook/doctrine/migrations /bundles/DoctrineFixturesBundle/index
 /cookbook/doctrine/doctrine_fixtures /bundles/DoctrineFixturesBundle/index
 /cookbook/doctrine/mongodb /bundles/DoctrineMongoDBBundle/index
+/cookbook/form/dynamic_form_generation /cookbook/form/dynamic_form_modification
 /cookbook/form/simple_signup_form_with_mongodb /bundles/DoctrineMongoDBBundle/form
 /cookbook/email /cookbook/email/email
 /cookbook/gmail /cookbook/email/gmail
