removed missing entry
Fix indentation for the `showAction` when annotations are not used
Fixed FormCommand to use unified generator interface
feature #232 Fixed FormCommand to use unified generator interface (kuusas)

This PR was merged into the master branch.

Discussion
----------

Fixed FormCommand to use unified generator interface

It had hardcoded DoctrineFormGenerator instance creation, instead of unified generator interface usage.

Commits
-------

8dae5e0 Fixed FormCommand to use unified generator interface
minor #226 Fix indentation for the `showAction` when annotations are not used (michaelperrin)

This PR was submitted for the 2.1 branch but it was merged into the master branch instead (closes #226).

Discussion
----------

Fix indentation for the `showAction` when annotations are not used

Before:

    public function showAction($id)
    {
        // ...

        return $this->render('AcmeDemoBundle:Entity:show.html.twig', array(
            'entity'      => $entity,
            'delete_form' => $deleteForm->createView(),        ));
    }

After:

    public function showAction($id)
    {
        // ...

        return $this->render('AcmeDemoBundle:Entity:show.html.twig', array(
            'entity'      => $entity,
            'delete_form' => $deleteForm->createView(),
        ));
    }

Commits
-------

8e8a90d Fix indentation for the `showAction` when annotations are not used
Fix code block formatting
Fix typos
minor #241 Fix typos (bicpi)

This PR was merged into the 2.2 branch.

Discussion
----------

Fix typos

Commits
-------

0a87262 Fix typos
Merge branch '2.2'

* 2.2:
  Fix typos
minor #242 Fix code block formatting (bicpi)

This PR was merged into the master branch.

Discussion
----------

Fix code block formatting

Commits
-------

6fd4b32 Fix code block formatting
commands/generate_controller added to map in docs
minor #243 Command generate_controller added to map in documentation (peterkokot)

This PR was merged into the master branch.

Discussion
----------

Command generate_controller added to map in documentation

Commits
-------

ec36a80 commands/generate_controller added to map in docs
Merge remote-tracking branch 'remotes/sensio/master' into overwrite-form