merged branch jorgemaiden/patch-1 (PR #6525)

This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes #6525).

Commits
-------

0b5f1e3 Update src/Symfony/Component/HttpFoundation/Response.php

Discussion
----------

Update src/Symfony/Component/HttpFoundation/Response.php

Fix phpdoc typo
This commit is contained in:
Fabien Potencier 2013-01-03 20:29:37 +01:00
commit 66b5818cf9

View File

@ -505,7 +505,7 @@ class Response
} }
/** /**
* Sets the number of seconds after the time specified in the response's Date * Returns the number of seconds after the time specified in the response's Date
* header when the the response should no longer be considered fresh. * header when the the response should no longer be considered fresh.
* *
* First, it checks for a s-maxage directive, then a max-age directive, and then it falls * First, it checks for a s-maxage directive, then a max-age directive, and then it falls