diff --git a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
index 54bb527759..42813c1773 100644
--- a/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
+++ b/src/Symfony/Bundle/FrameworkBundle/Controller/Controller.php
@@ -47,9 +47,9 @@ class Controller extends ContainerAware
     /**
      * Forwards the request to another controller.
      *
-     * @param  string  $controller The controller name (a string like BlogBundle:Post:index)
-     * @param  array   $path       An array of path parameters
-     * @param  array   $query      An array of query parameters
+     * @param string $controller The controller name (a string like BlogBundle:Post:index)
+     * @param array  $path       An array of path parameters
+     * @param array  $query      An array of query parameters
      *
      * @return Response A Response instance
      */
@@ -61,7 +61,7 @@ class Controller extends ContainerAware
     /**
      * Returns a RedirectResponse to the given URL.
      *
-     * @param string  $url The URL to redirect to
+     * @param string  $url    The URL to redirect to
      * @param integer $status The status code to use for the Response
      *
      * @return RedirectResponse
@@ -87,9 +87,9 @@ class Controller extends ContainerAware
     /**
      * Renders a view.
      *
-     * @param string   $view The view name
+     * @param string   $view       The view name
      * @param array    $parameters An array of parameters to pass to the view
-     * @param Response $response A response instance
+     * @param Response $response   A response instance
      *
      * @return Response A Response instance
      */
@@ -105,6 +105,9 @@ class Controller extends ContainerAware
      *
      *     throw $this->createNotFoundException('Page not found!');
      *
+     * @param string    $message  A message
+     * @param Exception $previous The previous exception
+     *
      * @return NotFoundHttpException
      */
     public function createNotFoundException($message = 'Not Found', \Exception $previous = null)
@@ -116,8 +119,8 @@ class Controller extends ContainerAware
      * Creates and returns a Form instance from the type of the form.
      *
      * @param string|FormTypeInterface $type    The built type of the form
-     * @param mixed $data                       The initial data for the form
-     * @param array $options                    Options for the form
+     * @param mixed                    $data    The initial data for the form
+     * @param array                    $options Options for the form
      *
      * @return Form
      */
@@ -129,8 +132,8 @@ class Controller extends ContainerAware
     /**
      * Creates and returns a form builder instance
      *
-     * @param mixed $data               The initial data for the form
-     * @param array $options            Options for the form
+     * @param mixed $data    The initial data for the form
+     * @param array $options Options for the form
      *
      * @return FormBuilder
      */
@@ -168,7 +171,7 @@ class Controller extends ContainerAware
     /**
      * Returns true if the service id is defined.
      *
-     * @param  string  $id The service id
+     * @param string $id The service id
      *
      * @return Boolean true if the service id is defined, false otherwise
      */
@@ -180,7 +183,7 @@ class Controller extends ContainerAware
     /**
      * Gets a service by id.
      *
-     * @param  string $id The service id
+     * @param string $id The service id
      *
      * @return object The service
      */