Skip to content

Commit

Permalink
Merge branch 'master' of github.com:symfony/symfony-docs into transla…
Browse files Browse the repository at this point in the history
…tion-debug
  • Loading branch information
florianv committed Mar 13, 2014
2 parents 2d9647b + 857725b commit 864b9f2
Show file tree
Hide file tree
Showing 105 changed files with 2,217 additions and 975 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.DS_Store
4 changes: 2 additions & 2 deletions book/controller.rst
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ object that's returned from that controller::
return $response;
}

Notice that the `forward()` method uses the same string representation of
Notice that the ``forward()`` method uses the same string representation of
the controller used in the routing configuration. In this case, the target
controller class will be ``HelloController`` inside some ``AcmeHelloBundle``.
The array passed to the method becomes the arguments on the resulting controller.
Expand Down Expand Up @@ -794,7 +794,7 @@ The Request Object
Besides the values of the routing placeholders, the controller also has access
to the ``Request`` object. The framework injects the ``Request`` object in the
controller if a variable is type-hinted with
`Symfony\Component\HttpFoundation\Request`::
:class:`Symfony\\Component\\HttpFoundation\\Request`::

use Symfony\Component\HttpFoundation\Request;

Expand Down
Loading

0 comments on commit 864b9f2

Please sign in to comment.