merged branch franmomu/patch-1 (PR #7317)

This PR was merged into the 2.1 branch.

Commits
-------

547350c [FrameworkBundle] Fix code status in dockblock

Discussion
----------

[FrameworkBundle] Fixed code status in docblock

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

---------------------------------------------------------------------------

by Tobion at 2013-03-09T15:23:46Z

👍
This commit is contained in:
Fabien Potencier 2013-03-10 08:25:48 +01:00
commit a27f7d8c59

View File

@ -25,8 +25,8 @@ class RedirectController extends ContainerAware
/**
* Redirects to another route with the given name.
*
* The response status code is 301 if the permanent parameter is false (default),
* and 302 if the redirection is permanent.
* The response status code is 302 if the permanent parameter is false (default),
* and 301 if the redirection is permanent.
*
* In case the route name is empty, the status code will be 404 when permanent is false
* and 410 otherwise.
@ -51,8 +51,8 @@ class RedirectController extends ContainerAware
/**
* Redirects to a URL.
*
* The response status code is 301 if the permanent parameter is false (default),
* and 302 if the redirection is permanent.
* The response status code is 302 if the permanent parameter is false (default),
* and 301 if the redirection is permanent.
*
* In case the path is empty, the status code will be 404 when permanent is false
* and 410 otherwise.