bumped version to 2.2
merged branch schmittjoh/managerFix (PR #159)

Commits
-------

3e900ef made converter a bit smarter when choosing the manager

Discussion
----------

made converter a bit smarter when choosing the manager

If using multiple entity managers, the parameter converter was by default using the default entity manager instead of selecting the entity manager which is actually managing a given class.

This PR makes this choice a bit smarter.
fixes a bug when a non-entity object is checked
fixed previous commit
merged branch schmittjoh/patch-1 (PR #160)

Commits
-------

eb2cb40 fixed previous commit
920a4a1 fixes a bug when a non-entity object is checked

Discussion
----------

fixes a bug when a non-entity object is checked
[ParamConverter] added repository_method option to the DoctrineParamConverter
merged branch Gregoire-M/ticket_153 (PR #154)

This PR was squashed before being merged into the master branch (closes #154).

Commits
-------

437296d [ParamConverter] added repository_method option to the DoctrineParamConverter

Discussion
----------

[ParamConverter] added repository_method option to the DoctrineParamConverter

[ParamConverter] added possibility to specify the repository method to use for DoctrineParamConverter, using the "repository_method" option

Bug fix: no
Feature addition: yes
Backwards compatibility break: no
Symfony2 tests pass: yes
Fixes the following tickets: #153
Todo: -
License of the code: MIT
Documentation PR: -

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

by schmittjoh at 2012-09-15T10:13:11Z

ping @fabpot

This looks pretty useful if you'd like to optimize which relations get loaded depending on the action.
created CHANGELOG for 2.2
[2.1] Fixed template parent bundle
merged branch francisbesset/2.1_fixed_template_parent_bundle (PR #161)

This PR was squashed before being merged into the 2.1 branch (closes #161).

Commits
-------

16cdbf3 [2.1] Fixed template parent bundle

Discussion
----------

[2.1] Fixed template parent bundle

This PR can be applied on master branch
typo in ParamConverter doc

Copying the example results in a DTD error when parsing the XML, as the attribute "name" is used twice.

The attribute should actually be called "converter" (see https://https://github.com/sensio/SensioFrameworkExtraBundle/blob/2.1/DependencyInjection/Compiler/AddParamConverterPass.php#L35)
merged branch Burgov/patch-2 (PR #166)

This PR was merged into the 2.1 branch.

Commits
-------

c6872e2 typo in ParamConverter doc

Discussion
----------

typo in ParamConverter doc

Copying the example results in a DTD error when parsing the XML, as the attribute "name" is used twice.

The attribute should actually be called "converter" (see https://github.com/sensio/SensioFrameworkExtraBundle/blob/2.1/DependencyInjection/Compiler/AddParamConverterPass.php#L35)
Fixed typo to render note block

There was a space missing between `..` and `note` which leads to a code block instead of a note.
merged branch WouterJ/patch-2 (PR #167)

This PR was merged into the 2.1 branch.

Commits
-------

76def86 Fixed typo to render note block

Discussion
----------

Fixed typo to render note block

There was a space missing between `..` and `note` which leads to a code block instead of a note.
[Doc] Be more consistant on routing example
[Doc] Added more doc about default value

see https://github.com/symfony/symfony/pull/5904
merged branch lyrixx/doc-command-default-value (PR #172)

This PR was merged into the master branch.

Commits
-------

79d7839 [Doc] Added more doc about default value
06e22ab [Doc] Be more consistant on routing example

Discussion
----------

Doc command default value

see https://github.com/symfony/symfony/pull/5904
Added a link to information on how to activate annotated routes to the Bundle main page

Bundle review page should give a complete general idea on how to use annotated routing, but it doesn't say about how to activate annotated routing. Developer had to read further to find required information.
merged branch vdroznik/2.0 (PR #180)

This PR was merged into the 2.0 branch.

Commits
-------

51b7ffb Added a link to information on how to activate annotated routes to the Bundle main page

Discussion
----------

Documentation: Add information on how to activate annotated routes to main page

Bundle review page should give a complete general idea on how to use annotated routing, but it doesn't say about how to activate (import) annotated routing. Developer had to read further to find required information before.
Merge branch '2.0' into 2.1

* 2.0:
  Added a link to information on how to activate annotated routes to the Bundle main page