Skip to content

Commit

Permalink
Merge branch '2.5' into 2.6
Browse files Browse the repository at this point in the history
* 2.5:
  Removing bad period
  • Loading branch information
weaverryan committed Nov 25, 2014
2 parents f544d5f + 58c0baf commit ffd8d78
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion book/controller.rst
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ the following guidelines in mind while you develop.
the name of the route that was matched (e.g. ``hello``). Though not usually
useful, this is also available as a controller argument. You can also
pass other variables from your route to your controller arguments. See
:doc:`/cookbook/routing/extra_information.`.
:doc:`/cookbook/routing/extra_information`.

.. _book-controller-request-argument:

Expand Down

0 comments on commit ffd8d78

Please sign in to comment.