Merge branch '1.0' into 1.1

* 1.0:
  fix docblock
  Update intro.rst - Included links to Symfony2, Pimple and Sinatra
  typo fixed in doc/providers.rst

doc/intro.rst

@@ -2,7 +2,7 @@ Introduction
 ============
 
 Silex is a PHP microframework for PHP 5.3. It is built on the shoulders of
-Symfony2 and Pimple and also inspired by sinatra.
+`Symfony2`_ and `Pimple`_ and also inspired by `Sinatra`_.
 
 A microframework provides the guts for building simple single-file apps. Silex
 aims to be:
@@ -46,3 +46,6 @@ Installing Silex is as easy as it can get. `Download`_ the archive file,
 extract it, and you're done!
 
 .. _Download: http://silex.sensiolabs.org/download
+.. _Symfony2: http://symfony.com/
+.. _Pimple: http://pimple.sensiolabs.org/
+.. _Sinatra: http://www.sinatrarb.com/

src/Silex/Application.php

@@ -482,7 +482,7 @@ class Application extends \Pimple implements HttpKernelInterface, TerminableInte
     /**
      * Handles the request and delivers the response.
      *
-     * @param Request $request Request to process
+     * @param Request|null $request Request to process
      */
     public function run(Request $request = null)
     {