Merge branch '2.3' into 2.5

weaverryan · weaverryan · commit bbcb866571bb · 2014-10-08T15:16:02.000-04:00
* 2.3:
  Fix spelling
  Changed to reference the correct twig template
  Fix PropertyAccessorBuilder usage
diff --git a/components/property_access/introduction.rst b/components/property_access/introduction.rst
@@ -205,7 +205,7 @@ enable this feature by using :class:`Symfony\\Component\\PropertyAccess\\Propert
     $person = new Person();
 
     // Enable magic __call
-    $accessor = PropertyAccess::getPropertyAccessorBuilder()
+    $accessor = PropertyAccess::createPropertyAccessorBuilder()
         ->enableMagicCall()
         ->getPropertyAccessor();
 
@@ -301,7 +301,7 @@ see `Enable other Features`_.
     $person = new Person();
 
     // Enable magic __call
-    $accessor = PropertyAccess::getPropertyAccessorBuilder()
+    $accessor = PropertyAccess::createPropertyAccessorBuilder()
         ->enableMagicCall()
         ->getPropertyAccessor();
 
diff --git a/quick_tour/the_view.rst b/quick_tour/the_view.rst
@@ -157,7 +157,7 @@ First, create an ``embedded.html.twig`` template:
     {# src/Acme/DemoBundle/Resources/views/Demo/embedded.html.twig #}
     Hello {{ name }}
 
-And change the ``index.html.twig`` template to include it:
+And change the ``hello.html.twig`` template to include it:
 
 .. code-block:: jinja
 
