Merge pull request symfony#2445 from WouterJ/fix_errors_21

weaverryan · weaverryan · commit cd9eda4371da · 2013-04-01T05:06:33.000-07:00
[2.1] Fixed build errors
diff --git a/cookbook/form/dynamic_form_modification.rst b/cookbook/form/dynamic_form_modification.rst
@@ -161,12 +161,11 @@ How to Dynamically Generate Forms based on user data
 ====================================================
 
 Sometimes you want a form to be generated dynamically based not only on data
-from this form (see :doc:`Dynamic form generation</cookbook/dynamic_form_generation>`)
-but also on something else. For example depending on the user currently using
-the application. If you have a social website where a user can only message
-people who are his friends on the website, then the current user doesn't need to
-be included as a field of your form, but a "choice list" of whom to message
-should only contain users that are the current user's friends.
+from this form but also on something else. For example depending on the user
+currently using the application. If you have a social website where a user can
+only message people who are his friends on the website, then the current user
+doesn't need to be included as a field of your form, but a "choice list" of
+whom to message should only contain users that are the current user's friends.
 
 Creating the form type
 ----------------------
diff --git a/cookbook/form/unit_testing.rst b/cookbook/form/unit_testing.rst
@@ -149,7 +149,7 @@ Adding custom Extensions
 ------------------------
 
 It often happens that you use some options that are added by
-:doc:`form extensions<cookbook/form/create_form_type_extension>`. One of the
+:doc:`form extensions</cookbook/form/create_form_type_extension>`. One of the
 cases may be the ``ValidatorExtension`` with its ``invalid_message`` option.
 The ``TypeTestCase`` loads only the core form extension so an "Invalid option"
 exception will be raised if you try to use it for testing a class that depends
diff --git a/reference/forms/types/form.rst b/reference/forms/types/form.rst
@@ -19,6 +19,8 @@ on all fields.
 
 .. include:: /reference/forms/types/options/read_only.rst.inc
 
+.. include:: /reference/forms/types/options/disabled.rst.inc
+
 .. include:: /reference/forms/types/options/trim.rst.inc
 
 .. include:: /reference/forms/types/options/mapped.rst.inc
