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

fabpot · fabpot · commit 66b5818cf96d · 2013-01-03T20:29:37.000+01:00
This PR was submitted for the master branch but it was merged into the 2.0 branch instead (closes symfony#6525). Commits ------- 0b5f1e3 Update src/Symfony/Component/HttpFoundation/Response.php Discussion ---------- Update src/Symfony/Component/HttpFoundation/Response.php Fix phpdoc typo
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -505,7 +505,7 @@ public function setExpires(\DateTime $date = null)
     }
 
     /**
-     * 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.
      *
      * First, it checks for a s-maxage directive, then a max-age directive, and then it falls

Original file line number	Diff line number	Diff line change
`@@ -505,7 +505,7 @@ public function setExpires(\DateTime $date = null)`
`505`	`505`	`}`
`506`	`506`
`507`	`507`	`/**`
`508`		`- * Sets the number of seconds after the time specified in the response's Date`
	`508`	`+ * Returns the number of seconds after the time specified in the response's Date`
`509`	`509`	`* header when the the respon 41FA se should no longer be considered fresh.`
`510`	`510`	`*`
`511`	`511`	`* First, it checks for a s-maxage directive, then a max-age directive, and then it falls`