Merge branch '2.0' into 2.1

weaverryan · weaverryan · commit df95c7bde91c · 2013-05-03T13:01:06.000-06:00
diff --git a/components/dependency_injection/parentservices.rst b/components/dependency_injection/parentservices.rst
@@ -273,6 +273,11 @@ when the child services are instantiated.
    is that omitting the ``parent`` config key will mean that the ``calls``
    defined on the ``mail_manager`` service will not be executed when the
    child services are instantiated.
+   
+.. caution::
+
+   The ``scope``, ``abstract`` and ``tags`` attributes are always taken from
+   the child service.
 
 The parent service is abstract as it should not be directly retrieved from the
 container or passed into another service. It exists merely as a "template" that
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -218,7 +218,7 @@ The tagged service will be removed from the container if the
 ``framework.templating.engines`` config section does not contain php.
 
 assetic.templating.twig
-----------------------
+-----------------------
 
 **Purpose**: Remove this service if twig templating is disabled
 
diff --git a/reference/forms/types/options/hours.rst.inc b/reference/forms/types/options/hours.rst.inc
@@ -1,7 +1,7 @@
 hours
 ~~~~~
 
-**type**: ``integer`` **default**: 0 to 23
+**type**: ``array`` **default**: 0 to 23
 
 List of hours available to the hours field type. This option is only relevant
 when the ``widget`` option is set to ``choice``.
diff --git a/reference/forms/types/options/minutes.rst.inc b/reference/forms/types/options/minutes.rst.inc
@@ -1,7 +1,7 @@
 minutes
 ~~~~~~~
 
-**type**: ``integer`` **default**: 0 to 59
+**type**: ``array`` **default**: 0 to 59
 
 List of minutes available to the minutes field type.  This option is only
 relevant when the ``widget`` option is set to ``choice``.
diff --git a/reference/forms/types/options/seconds.rst.inc b/reference/forms/types/options/seconds.rst.inc
@@ -1,7 +1,7 @@
 seconds
 ~~~~~~~
 
-**type**: ``integer`` **default**: 0 to 59
+**type**: ``array`` **default**: 0 to 59
 
 List of seconds available to the seconds field type. This option is only
 relevant when the ``widget`` option is set to ``choice``.
