Merge branch '1.2' into 1.3

* 1.2:
  Fix return of renderView to string
  Add mention of patch method to usage docs

Conflicts:
	doc/usage.rst

doc/usage.rst

@@ -70,7 +70,7 @@ route is matched. A route pattern consists of:
   requirements for them.
 
 * *Method*: One of the following HTTP methods: ``GET``, ``POST``, ``PUT`` or
-  ``DELETE``. This describes the interaction with the resource.
+  ``DELETE`` or ``PATCH``. This describes the interaction with the resource.
 
 The controller is defined using a closure like this::
 
@@ -185,6 +185,10 @@ methods on your application: ``get``, ``post``, ``put``, ``delete``::
         // ...
     });
 
+    $app->patch('/blog/{id}', function ($id) {
+        // ...
+    });
+
 .. tip::
 
     Forms in most web browsers do not directly support the use of other HTTP

src/Silex/Application/TwigTrait.php

@@ -56,7 +56,7 @@ public function render($view, array $parameters = array(), Response $response =
      * @param string $view       The view name
      * @param array  $parameters An array of parameters to pass to the view
      *
-     * @return Response A Response instance
+     * @return string The rendered view
      */
     public function renderView($view, array $parameters = array())
     {