merged branch hiciu/master (PR #521)

This PR was merged into the master branch.

Commits
-------

33d802ec updated FormTrait documentation

Discussion
----------

Updated doc/providers/form.rst

Hello,

Only one line changed. FormTrait adds ```function form($data, $options)``` to \Silex\Application, not ```form($name, $data, $options)``` like createBuilder; this example in docs was throwing exception.

(this is my first pull request and now I see I should have done it in separate branch; sorry. I hope I didn't broke anything)

---------------------------------------------------------------------------

by igorw at 2012-10-29T02:25:44Z

👍

doc/providers/form.rst

@@ -169,7 +169,7 @@ Traits
 
 .. code-block:: php
 
-    $app->form('form', $data);
+    $app->form($data);
 
 For more information, consult the `Symfony2 Forms documentation
 <http://symfony.com/doc/2.1/book/forms.html>`_.