From c0167daa4a5b6f63e51452d86964f55cfae9410e Mon Sep 17 00:00:00 2001 From: Thierry Geindre Date: Tue, 7 Oct 2014 16:22:43 +0200 Subject: [PATCH 1/4] Fix PropertyAccessorBuilder usage --- components/property_access/introduction.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/property_access/introduction.rst b/components/property_access/introduction.rst index a9eb4083fd9..8d6492c8d8e 100644 --- a/components/property_access/introduction.rst +++ b/components/property_access/introduction.rst @@ -209,7 +209,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(); @@ -305,7 +305,7 @@ see `Enable other Features`_. $person = new Person(); // Enable magic __call - $accessor = PropertyAccess::getPropertyAccessorBuilder() + $accessor = PropertyAccess::createPropertyAccessorBuilder() ->enableMagicCall() ->getPropertyAccessor(); From 8bb1c9a68204e362bb377e4e754b6ff305c0aec4 Mon Sep 17 00:00:00 2001 From: Evan Owens Date: Tue, 7 Oct 2014 16:34:04 -0400 Subject: [PATCH 2/4] Fix spelling "so-called" is a traditionally hyphenated compound word. --- cookbook/configuration/web_server_configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst index e93e873307c..3e248ddf205 100644 --- 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: From d420491e36da04350fe09de445d4a3aff6e767e9 Mon Sep 17 00:00:00 2001 From: Milan Magudia Date: Tue, 7 Oct 2014 19:20:02 +0100 Subject: [PATCH 3/4] Changed to reference the correct twig template --- quick_tour/the_view.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quick_tour/the_view.rst b/quick_tour/the_view.rst index c641eb6db10..470cd51226e 100644 --- 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 From 60c0c82c06583fbe14c3bca331d81e789b255c87 Mon Sep 17 00:00:00 2001 From: Evan Owens Date: Tue, 7 Oct 2014 16:34:04 -0400 Subject: [PATCH 4/4] Fix spelling "so-called" is a traditionally hyphenated compound word. --- cookbook/configuration/web_server_configuration.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookbook/configuration/web_server_configuration.rst b/cookbook/configuration/web_server_configuration.rst index e93e873307c..3e248ddf205 100644 --- 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: