Merge branch '1.3'

Author: wouterj

bundles/content/exposing_content_via_rest.rst

@@ -139,7 +139,7 @@ commands:
 
 This is all it takes to enable read support via JSON or XML!
 
-The JMS serializer comes with sense defaults for Doctrine object mappers.
+The JMS serializer comes with sensible defaults for Doctrine object mappers.
 However it might be necessary to add additional mapping to more tightly
 control what gets exposed. See the `documentation of the JMS serializer`_
 for details.

bundles/seo/extractors.rst

@@ -50,7 +50,7 @@ description, you can implement both interfaces and your result will be::
     use Symfony\Cmf\Bundle\SeoBundle\Extractor\DescriptionReadInterface;
     use Symfony\Cmf\Bundle\SeoBundle\Extractor\ExtrasReadInterface;
 
-    class Article implements TitleReadInterface, DescriptionReadInterface, ExtraReadInterface
+    class Article implements TitleReadInterface, DescriptionReadInterface, ExtrasReadInterface
     {
         protected $title;
         protected $publishDate;

tutorial/make-homepage.rst

@@ -319,6 +319,7 @@ making a given page the homepage. Add the following to the existing
     // src/AppBundle/Controller/DefaultController.php
 
     use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+    use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 
     // ...
     class DefaultController extends Controller