Merge branch '1.3'

* 1.3:
  doFlush returns the same RouteCollection instance now, so there's no need to add the sub-collection routes to itself
  removing removed cookbook entry in the list

doc/cookbook/index.rst

@@ -8,7 +8,6 @@ The cookbook section contains recipes for solving specific problems.
     :hidden:
 
     json_request_body
-    translating_validation_messages
     session_storage
     form_no_csrf
     validator_yaml
@@ -23,8 +22,6 @@ Recipes
   building a restful API is the ability to accept a JSON encoded entity from
   the request body.
 
-* :doc:`Translating Validation Messages<translating_validation_messages>`.
-
 * :doc:`Using PdoSessionStorage to store Sessions in the Database
   <session_storage>`.
 

src/Silex/ControllerCollection.php

@@ -215,7 +215,7 @@ class ControllerCollection
                 $routes->add($name, $controller->getRoute());
                 $controller->freeze();
             } else {
-                $routes->addCollection($controller->doFlush($prefix.$controller->prefix, $routes));
+                $controller->doFlush($prefix.$controller->prefix, $routes);
             }
         }