Skip to content

Remove minor bugs from docs. #10850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controller.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions introduction/from_flat_php_to_symfony2.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 </components/routing>` and component and :doc:`Twig </templating>`,
:doc:`Routing </components/routing>` component and :doc:`Twig </templating>`,
which already solve these problems.

Instead of re-solving common problems, you can let Symfony take care of
Expand Down
2 changes: 1 addition & 1 deletion templating.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down