Merge branch '1.0' into 1.1

* 1.0: TranslationServiceProvider replaced translator.messages by translator.domains.
fabpot · Jan 20, 2014 · 43760a4 · 43760a4
2 parents 93dde27 + ddcec07
commit 43760a4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/doc/providers/form.rst b/doc/providers/form.rst
@@ -145,7 +145,7 @@ form by adding constraints on the fields::
 
     $app->register(new Silex\Provider\ValidatorServiceProvider());
     $app->register(new Silex\Provider\TranslationServiceProvider(), array(
-        'translator.messages' => array(),
+        'translator.domains' => array(),
     ));
 
     $form = $app['form.factory']->createBuilder('form')