Merge branch '2.8' into 3.0

symfony · Jan 4, 2016 · 6eeb61e · 6eeb61e
2 parents 64f8a1e + 889db17
commit 6eeb61e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/book/forms.rst b/book/forms.rst
@@ -1168,7 +1168,7 @@ Defining your Forms as Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Your form type might have some external dependencies. You can define your form
-type as a service, and inject inject all dependencies you need.
+type as a service, and inject all dependencies you need.
 
 .. note::
 

diff --git a/contributing/code/core_team.rst b/contributing/code/core_team.rst
@@ -67,12 +67,13 @@ Active Core Members
 
   * **Jakub Zalas** (`jakzal`_) can merge into the DomCrawler_ component.
 
+  * **Christian Flothmann** (`xabbuh`_) can merge into the Yaml_ component.
+
 * **Deciders** (``@symfony/deciders`` on GitHub):
 
   * **Jordi Boggiano** (`seldaek`_);
   * **Lukas Kahwe Smith** (`lsmith77`_);
-  * **Ryan Weaver** (`weaverryan`_);
-  * **Christian Flothmann** (`xabbuh`_).
+  * **Ryan Weaver** (`weaverryan`_).
 
 Core Membership Application
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -153,6 +154,7 @@ discretion of the **Project Leader**.
 .. _Config: https://github.com/symfony/config
 .. _Console: https://github.com/symfony/console
 .. _Debug: https://github.com/symfony/debug
+.. _DebugBundle: https://github.com/symfony/debug-bundle
 .. _DependencyInjection: https://github.com/symfony/dependency-injection
 .. _DoctrineBridge: https://github.com/symfony/doctrine-bridge
 .. _EventDispatcher: https://github.com/symfony/event-dispatcher
@@ -174,7 +176,7 @@ discretion of the **Project Leader**.
 .. _TwigBridge: https://github.com/symfony/twig-bridge
 .. _Validator: https://github.com/symfony/validator
 .. _VarDumper: https://github.com/symfony/var-dumper
-.. _DebugBundle: https://github.com/symfony/debug-bundle
+.. _Yaml: https://github.com/symfony/yaml
 .. _`fabpot`: https://github.com/fabpot/
 .. _`webmozart`: https://github.com/webmozart/
 .. _`Tobion`: https://github.com/Tobion/

diff --git a/reference/forms/types/collection.rst b/reference/forms/types/collection.rst
@@ -312,7 +312,7 @@ entry_type
 ~~~~~~~~~~
 
 .. versionadded:: 2.8
-    The ``entry_type`` option was introduced in Symfony 2.8 in favor of
+    The ``entry_type`` option was introduced in Symfony 2.8 and replaces
     ``type``, which is available prior to 2.8.
 
 **type**: ``string`` or :class:`Symfony\\Component\\Form\\FormTypeInterface` **required**