Merge remote-tracking branch 'origin/2.0' into 2.0

Author: weaverryan

book/service_container.rst

@@ -848,8 +848,8 @@ the framework.
 
 .. tip::
 
-    Be sure that ``swiftmailer`` entry appears in your application
-    configuration. As you mentioned in :ref:`service-container-extension-configuration`,
+    Be sure that the ``swiftmailer`` entry appears in your application
+    configuration. As was mentioned in :ref:`service-container-extension-configuration`,
     the ``swiftmailer`` key invokes the service extension from the
     ``SwiftmailerBundle``, which registers the ``mailer`` service.
 

cookbook/form/form_collections.rst

@@ -272,7 +272,7 @@ Allowing "new" tags with the "prototype"
 
 Allowing the user to dynamically add new tags means that you'll need to
 use some JavaScript. Previously you added two tags to your form in the controller.
-Now to let the user add as many tag forms as he needs directly in the browser.
+Now let the user add as many tag forms as he needs directly in the browser.
 This will be done through a bit of JavaScript.
 
 The first thing you need to do is to let the form collection know that it will

reference/forms/twig_reference.rst

@@ -213,7 +213,7 @@ object:
 
         <label for="{{ form.name.vars.id }}"
             class="{{ form.name.vars.required ? 'required' : '' }}">
-            {{ form.name.label }}
+            {{ form.name.vars.label }}
         </label>
 
     .. code-block:: html+php