Some additional tweaks and probably some merge conflict fixes

weaverryan · weaverryan · commit 4f6cb9dd1778 · 2014-01-22T15:55:02.000-06:00
diff --git a/reference/forms/types/button.rst b/reference/forms/types/button.rst
@@ -18,7 +18,7 @@ A simple, non-responsive button.
 |                      | - `label_attr`_                                                      |
 |                      | - `translation_domain`_                                              |
 +----------------------+----------------------------------------------------------------------+
-| Overriden options    | - `auto_initialize`_                                                 |
+| Overridden options   | - `auto_initialize`_                                                 |
 +----------------------+----------------------------------------------------------------------+
 | Parent type          | none                                                                 |
 +----------------------+----------------------------------------------------------------------+
diff --git a/reference/forms/types/checkbox.rst b/reference/forms/types/checkbox.rst
@@ -46,15 +46,8 @@ Field Options
 
 .. include:: /reference/forms/types/options/value.rst.inc
 
-Overriden options
------------------
-
-.. include:: /reference/forms/types/options/checkbox_empty_data.rst.inc
-
-.. include:: /reference/forms/types/options/checkbox_compound.rst.inc
-
-Overriden options
------------------
+Overridden options
+------------------
 
 .. include:: /reference/forms/types/options/checkbox_empty_data.rst.inc
 
diff --git a/reference/forms/types/choice.rst b/reference/forms/types/choice.rst
@@ -20,7 +20,7 @@ option.
 |             | - `preferred_choices`_                                                       |
 |             | - `empty_value`_                                                             |
 +-------------+------------------------------------------------------------------------------+
-| Overriden   | - `empty_data`_                                                              |
+| Overridden  | - `empty_data`_                                                              |
 | options     | - `compound`_                                                                |
 |             | - `error_bubbling`_                                                          |
 +-------------+------------------------------------------------------------------------------+
@@ -111,15 +111,15 @@ can be created to supply the choices.
 
 .. include:: /reference/forms/types/options/empty_value.rst.inc
 
-Overriden options
------------------
+Overridden options
+------------------
 
 .. include:: /reference/forms/types/options/empty_data.rst.inc
 
 compound
 ~~~~~~~~
 
-**type**: `̀ boolean`` **default**: same value as ``expanded`` option
+**type**: ``boolean`` **default**: same value as ``expanded`` option
 
 This option specifies if a form is compound. The value is by default 
 overriden by the value of the ``expanded`` option.
