diff --git a/controller.rst b/controller.rst index df952ec2b54..de05c223d8e 100644 --- a/controller.rst +++ b/controller.rst @@ -148,7 +148,7 @@ and ``redirect()`` methods:: // redirect to a route with parameters return $this->redirectToRoute('app_lucky_number', array('max' => 10)); - // redirects to a route and mantains the original query string parameters + // redirects to a route and maintains the original query string parameters return $this->redirectToRoute('blog_show', $request->query->all()); // redirects externally diff --git a/introduction/from_flat_php_to_symfony2.rst b/introduction/from_flat_php_to_symfony2.rst index 4bb7c21ffe1..78ec1280f9f 100644 --- a/introduction/from_flat_php_to_symfony2.rst +++ b/introduction/from_flat_php_to_symfony2.rst @@ -181,7 +181,7 @@ of the application are isolated in a new file called ``model.php``:: in this example, only a portion (or none) of the model is actually concerned with accessing a database. -The controller (``index.php``) is now is just a few lines of code:: +The controller (``index.php``) is now just a few lines of code:: // index.php require_once 'model.php'; @@ -262,7 +262,7 @@ an individual blog result based on a given id:: { $connection = open_database_connection(); - $query = 'SELECT created_at, title, body FROM post WHERE id=:id'; + $query = 'SELECT created_at, title, body FROM post WHERE id=:id'; $statement = $connection->prepare($query); $statement->bindValue(':id', $id, PDO::PARAM_INT); $statement->execute(); @@ -533,7 +533,7 @@ a simple application. Along the way, you've made a simple routing system and a method using ``ob_start()`` and ``ob_get_clean()`` to render templates. If, for some reason, you needed to continue building this "framework" from scratch, you could at least use Symfony's standalone -:doc:`Routing ` and component and :doc:`Twig `, +:doc:`Routing ` component and :doc:`Twig `, which already solve these problems. Instead of re-solving common problems, you can let Symfony take care of diff --git a/templating.rst b/templating.rst index 7a696f3bc85..55c1f453ab6 100644 --- a/templating.rst +++ b/templating.rst @@ -125,7 +125,7 @@ Throughout this article, template examples will be shown in both Twig and PHP. Twig can also do things that PHP can't, such as whitespace control, sandboxing, automatic HTML escaping, manual contextual output escaping, and the inclusion of custom functions and filters that only affect templates. - Twig contains little features that make writing templates easier and more concise. + Twig contains a lot of features that make writing templates easier and more concise. Take the following example, which combines a loop with a logical ``if`` statement: