merged branch jonathaningram/patch-7 (PR #4950)

fabpot · fabpot · commit 0f746a5a6690 · 2012-07-17T10:32:57.000+02:00
Commits ------- 764b1de [FrameworkBundle] minor typo in controller action docblock Discussion ---------- [FrameworkBundle] minor typo in controller action docblock
diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php b/src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
@@ -28,7 +28,7 @@ class RedirectController extends ContainerAware
      * It expects a route path parameter.
      * By default, the response status code is 301.
      *
-     * If the route empty, the status code will be 410.
+     * If the route is empty, the status code will be 410.
      * If the permanent path parameter is set, the status code will be 302.
      *
      * @param string  $route     The route pattern to redirect to

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class RedirectController extends ContainerAware`
`28`	`28`	`* It expects a route path parameter.`
`29`	`29`	`* By default, the response status code is 301.`
`30`	`30`	`*`
`31`		`- * If the route empty, the status code will be 410.`
	`31`	`+ * If the route is empty, the status code will be 410.`
`32`	`32`	`* If the permanent path parameter is set, the status code will be 302.`
`33`	`33`	`*`
`34`	`34`	`* @param string $route The route pattern to redirect to`