Skip to content

[Book] tweaks to #4427 #4447

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 13, 2014
Merged

[Book] tweaks to #4427 #4447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
tweaks to #4427 
Applied tweaks suggested by @javiereguiluz.
  • Loading branch information
@xabbuh
xabbuh committed Nov 11, 2014
commit caf927fa69e7acffedd10d24f2147e0bbd915b07
12 changes: 6 additions & 6 deletions book/routing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ entries? Update the route to have a new ``{page}`` placeholder:
.. code-block:: php-annotations

// src/AppBundle/Controller/BlogController.php

// ...

/**
Expand Down Expand Up @@ -470,7 +470,7 @@ This is done by including it in the ``defaults`` collection:
.. code-block:: php-annotations

// src/AppBundle/Controller/BlogController.php

// ...

/**
Expand Down Expand Up @@ -555,7 +555,7 @@ Take a quick look at the routes that have been created so far:
.. code-block:: php-annotations

// src/AppBundle/Controller/BlogController.php

// ...
class BlogController extends Controller
{
Expand Down Expand Up @@ -738,7 +738,7 @@ URL:
.. code-block:: php-annotations

// src/AppBundle/Controller/MainController.php

// ...
class MainController extends Controller
{
Expand Down Expand Up @@ -1283,8 +1283,8 @@ suppose you want to prefix all routes in the AppBundle with ``/site`` (e.g.

return $collection;

The string ``/site`` will now be prepended to the path of each route loaded
from the new routing resource.
The path of each route being loaded from the new routing resource will now
be prefixed with the string ``/site``.

Adding a Host Requirement to Imported Routes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
10 changes: 5 additions & 5 deletions book/templating.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@ By default, templates can live in two different locations:
third party bundle templates (see :ref:`overriding-bundle-templates`);

* ``path/to/bundle/Resources/views/``: Each third party bundle houses its
templates in its ``Resources/views`` directory (and subdirectories). When you
templates in its ``Resources/views/`` directory (and subdirectories). When you
plan to share your bundle, you should put the templates in the bundle instead
of the ``app/`` directory.

Expand Down Expand Up @@ -435,8 +435,8 @@ directory. This gives the power to override templates from any vendor bundle.

.. tip::

Hopefully the template naming syntax looks familiar - it's similair to the
naming convention used to refer to :ref:`controller-string-syntax`.
Hopefully the template naming syntax looks familiar - it's similar to
the naming convention used to refer to :ref:`controller-string-syntax`.

Template Suffix
~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -1353,7 +1353,7 @@ covered:
{% endblock %}

Notice that this template extends the section template (``Blog/layout.html.twig``)
which in-turn extends the base application layout (``base.html.twig``). This is
which in turn extends the base application layout (``base.html.twig``). This is
the common three-level inheritance model.

When building your application, you may choose to follow this method or simply
Expand Down Expand Up @@ -1466,7 +1466,7 @@ Debugging

When using PHP, you can use :phpfunction:`var_dump` if you need to quickly find
the value of a variable passed. This is useful, for example, inside your
controller. The same can be achieved when using Twig thanks to the debug
controller. The same can be achieved when using Twig thanks to the Debug
extension.

Template parameters can then be dumped using the ``dump`` function:
Expand Down