Merge branch '2.3'

Author: weaverryan

book/service_container.rst

@@ -658,7 +658,7 @@ Using references is a very powerful tool that allows you to create independent s
 classes with well-defined dependencies. In this example, the ``newsletter_manager``
 service needs the ``my_mailer`` service in order to function. When you define
 this dependency in the service container, the container takes care of all
-the work of instantiating the objects.
+the work of instantiating the classes.
 
 Optional Dependencies: Setter Injection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

book/templating.rst

@@ -685,8 +685,8 @@ tags:
 
     .. code-block:: jinja
 
-        {{ render_hinclude(controller('...')) %}
-        {{ render_hinclude(url('...')) %}
+        {{ render_hinclude(controller('...')) }}
+        {{ render_hinclude(url('...')) }}
 
     .. code-block:: php
 

components/class_loader/cache_class_loader.rst

@@ -13,7 +13,7 @@ Introduction
 
 Finding the file for a particular class can be an expensive task. Luckily,
 the Class Loader Component comes with two classes to cache the mapping
-from a class to its containing file. Both the :class:`Symfonfy\\Component\\ClassLoader\\ApcClassLoader`
+from a class to its containing file. Both the :class:`Symfony\\Component\\ClassLoader\\ApcClassLoader`
 and the :class:`Symfony\\Component\\ClassLoader\\XcacheClassLoader` wrap
 around an object which implements a ``findFile()`` method to find the file
 for a class.

components/dependency_injection/factories.rst

@@ -10,7 +10,7 @@ as well as calling methods and setting parameters. Sometimes, however, this
 will not provide you with everything you need to construct your objects.
 For this situation, you can use a factory to create the object and tell the
 service container to call a method on the factory rather than directly instantiating
-the object.
+the class.
 
 Suppose you have a factory that configures and returns a new NewsletterManager
 object::

components/dom_crawler.rst

@@ -230,13 +230,8 @@ and :phpclass:`DOMNode` objects:
 
     The ``html`` method is new in Symfony 2.3.
 
-Form and Link support
-~~~~~~~~~~~~~~~~~~~~~
-
-Special treatment is given to links and forms inside the DOM tree.
-
 Links
-.....
+~~~~~
 
 To find a link by name (or a clickable image by its ``alt`` attribute), use
 the ``selectLink`` method on an existing crawler. This returns a Crawler
@@ -264,7 +259,7 @@ methods to get more information about the selected link itself::
     URI that you can act on.
 
 Forms
-.....
+~~~~~
 
 Special treatment is also given to forms. A ``selectButton()`` method is
 available on the Crawler which returns another Crawler that matches a button

cookbook/console/sending_emails.rst

@@ -97,8 +97,16 @@ commands, emails are not sent automatically. You must take care of flushing
 the queue yourself. Use the following code to send emails inside your
 console command::
 
+    $message = new \Swift_Message();
+    
+    // ... prepare the message
+    
     $container = $this->getContainer();
     $mailer = $container->get('mailer');
+    
+    $mailer->send($message);
+    
+    // now manually flush the queue
     $spool = $mailer->getTransport()->getSpool();
     $transport = $container->get('swiftmailer.transport.real');
 

cookbook/form/use_empty_data.rst

@@ -61,7 +61,7 @@ that constructor with no arguments::
 
 You can instantiate your class however you want. In this example, we pass
 some dependency into the ``BlogType`` when we instantiate it, then use that
-to instantiate the ``Blog`` object. The point is, you can set ``empty_data``
+to instantiate the ``Blog`` class. The point is, you can set ``empty_data``
 to the exact "new" object that you want to use.
 
 Option 2: Provide a Closure

cookbook/service_container/scopes.rst

@@ -216,6 +216,11 @@ your code. This should also be taken into account when declaring your service:
                 ->setSynthetic(true)
                 ->setSynchronized(true);
 
+.. caution::
+
+    The service using the synchronized service will need to be public in order
+    have its setter called when the scope changes.
+
 .. _changing-service-scope:
 
 Changing the Scope of your Service

reference/forms/types/date.rst

@@ -12,7 +12,7 @@ a string, a timestamp or an array. As long as the `input`_ option is set
 correctly, the field will take care of all of the details.
 
 The field can be rendered as a single text box, three text boxes (month,
-day, and year) or three select boxes (see the `widget_` option).
+day, and year) or three select boxes (see the `widget`_ option).
 
 +----------------------+-----------------------------------------------------------------------------+
 | Underlying Data Type | can be ``DateTime``, string, timestamp, or array (see the ``input`` option) |