Merge pull request symfony#1089 from colinfrei/formfieldtypes

Formfieldtypes
maerlyn · Feb 20, 2012 · 16450da · 16450da
2 parents a75206c + 92798e2
commit 16450da
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/reference/forms/types/date.rst b/reference/forms/types/date.rst
@@ -78,7 +78,7 @@ Field Options
 empty_value
 ~~~~~~~~~~~
 
-**type**: ``string``|``array``
+**type**: ``string`` or ``array``
 
 If your widget option is set to ``choice``, then this field will be represented
 as a series of ``select`` boxes. The ``empty_value`` option can be used to

diff --git a/reference/forms/types/datetime.rst b/reference/forms/types/datetime.rst
@@ -19,9 +19,15 @@ data can be a ``DateTime`` object, a string, a timestamp or an array.
 |                      | - `time_widget`_                                                            |
 |                      | - `input`_                                                                  |
 |                      | - `date_format`_                                                            |
+|                      | - `hours`_                                                                  |
+|                      | - `minutes`_                                                                |
+|                      | - `seconds`_                                                                |
 |                      | - `years`_                                                                  |
 |                      | - `months`_                                                                 |
 |                      | - `days`_                                                                   |
+|                      | - `with_seconds`_                                                           |
+|                      | - `data_timezone`_                                                          |
+|                      | - `user_timezone`_                                                          |
 +----------------------+-----------------------------------------------------------------------------+
 | Parent type          | :doc:`form</reference/forms/types/form>`                                    |
 +----------------------+-----------------------------------------------------------------------------+

diff --git a/reference/forms/types/url.rst b/reference/forms/types/url.rst
@@ -11,7 +11,7 @@ have a protocol.
 +-------------+-------------------------------------------------------------------+
 | Rendered as | ``input url`` field                                               |
 +-------------+-------------------------------------------------------------------+
-| Options     | - ``default_protocol``                                            |
+| Options     | - `default_protocol`_                                             |
 +-------------+-------------------------------------------------------------------+
 | Inherited   | - `max_length`_                                                   |
 | options     | - `required`_                                                     |