Merge branch '2.5'

* 2.5: Fix spelling Changed to reference the correct twig template Fix spelling Fix PropertyAccessorBuilder usage
symfony · Oct 8, 2014 · 10e6f05 · 10e6f05
2 parents 6405a21 + bbcb866
commit 10e6f05
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
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/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst
@@ -89,7 +89,7 @@ the FastCGI process manager ``php-fpm`` binary and Apache's FastCGI module
 installed (for example, on a Debian based system you have to install the
 ``libapache2-mod-fastcgi`` and ``php5-fpm`` packages).
 
-PHP-FPM uses so called *pools* to handle incoming FastCGI requests. You can
+PHP-FPM uses so-called *pools* to handle incoming FastCGI requests. You can
 configure an arbitrary number of pools in the FPM configuration. In a pool
 you configure either a TCP socket (IP and port) or a unix domain socket to
 listen on. Each pool can also be run under a different UID and GID:

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