[Console] added some missing information in the phpdoc (closes #6464)
merged branch fabpot/phpdoc-fix (PR #6869)

This PR was merged into the master branch.

Commits
-------

e3086cc [Console] added some missing information in the phpdoc (closes #6464)

Discussion
----------

[Console] added some missing information in the phpdoc (closes #6464)

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #6464
| License       | MIT
| Doc PR        | n/a
css fix
merged branch vicb/exc/overflow (PR #6877)

This PR was merged into the master branch.

Commits
-------

189a05e css fix

Discussion
----------

css fix

before

![ov](https://f.cloud.github.com/assets/248818/97566/72a11c18-66fe-11e2-80b1-f434a5216a66.jpg)

after

![nov](https://f.cloud.github.com/assets/248818/97563/41ace560-66fe-11e2-988e-fcdb931d88d7.jpg)

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

by WouterJ at 2013-01-25T15:19:13Z

:+1:
Fixed missing class argument when throwing exception
merged branch xamado/master (PR #6884)

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

Commits
-------

c261760 Fixed missing class argument when throwing exception

Discussion
----------

Added missing parameter to Exception in DebugClassLoader

The DebugClassLoader was missing the $class argument to sprintf() when it tries to throw the exception, making the actual error you are getting more daunting :)

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

by stof at 2013-01-25T23:31:58Z

oops, sorry.

@fabpot this should be merged in 2.1 as you merged the change there
[Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
Merge branch '2.1'

* 2.1:
  [Yaml] fixed wrong merge (indentation default is 4 as of 2.1)
  Fixed missing class argument when throwing exception
[Routing] Improve RouteNotFoundException messages
merged branch franzliedke/patch-1 (PR #6893)

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

Commits
-------

7cff461 [Routing] Improve RouteNotFoundException messages

Discussion
----------

[Routing] Improve RouteNotFoundException messages

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | Travis?
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

The error message that is generated when a named route is not found can be a little confusing in the sense that one could think the name actually references a path for the route. This PR should make that a little clearer.

See [this Laravel ticket](https://github.com/laravel/framework/issues/177) for reference.

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

by franzliedke at 2013-01-28T09:44:43Z

Okay folks, I changed those. Thank you!
Updated UPGRADE-2.2.md for twig bridge section

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
[DIC] Better handling of enableable configurations
merged branch vicb/fmwk/config (PR #6852)

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

Commits
-------

fde7585 [DIC] Better handling of enableable configurations

Discussion
----------

[DIC] Better handling of enableable configurations

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no, this feature has not been released yet
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

My definition of bug fix might be discussable. The thing which I think is not discussable is that this PR fixes the semantic - and I think it is important for a "semantic configuration": before this PR, some nodes had `->canBeDisabled` for nodes that were actually disabled by default. Those nodes now have `->canBeEnabled` which sounds right.

**Edit: Jan 28, 2013** - history:

See [the related comments](https://github.com/symfony/symfony/pull/6829#discussion_r2727742).

I think Symfony **must** get the configuration right as we can expect of lot of devs to use this as a template when writting their own configuration.

@schmittjoh could you please give me your feedback on [this change](https://github.com/symfony/symfony/pull/6852/files#L4R224) considering [the rationale](https://github.com/symfony/symfony/pull/6852/files#L3R7).

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

by stof at 2013-01-23T16:10:33Z

@vicb your links are broken as they are pointing to the PR creation page

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

by stof at 2013-01-23T16:10:55Z

and to create a TODO list, it has to be a list first

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

by vicb at 2013-01-23T16:31:10Z

@stof thanks for reporting the broken links, they are fixed /cc @schmittjoh

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

by vicb at 2013-01-23T16:31:50Z

@Tobion please submit a PR to my repo, I don't have much time to work on this. Thanks !

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

by vicb at 2013-01-25T15:14:47Z

@fabpot @schmittjoh I'd like your feedback on the latest commit, rationale is in the method phpDoc. It better matches what we do now and seem the most sensible thing to do.

edit: with this you can no more disable the node explicitly, I have to find a better solution

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

by schmittjoh at 2013-01-25T15:20:13Z

Looks good.

On Fri, Jan 25, 2013 at 4:15 PM, Victor Berchet <notifications@github.com>wrote:

> @fabpot <https://github.com/fabpot> @schmittjoh<https://github.com/schmittjoh>I'd like your feedback on the latest commit, rationale is in the method
> phpDoc. It better matches what we do now and seem the most sensible thing
> to do.
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/symfony/symfony/pull/6852#issuecomment-12704585>.
>
>

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

by vicb at 2013-01-28T14:37:57Z

@fabpot I know I keep insisting on this one and I am sorry for that but I think this should be considered as a bug fix (see the PR header for details) and should be merged in 2.2. I think the Symfony core should be exemplary as it is used by many developers as a template when creating their own bundle. *This PR is no more a WIP and can be merged right now*.

In addition to fixing the enableable nodes, this PR contain new UTs and some fixes to the code / tests.

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

by fabpot at 2013-01-28T16:43:42Z

@vicb As explained in a comment, this is not a BC break as this feature does not exist in 2.1. So, I can make the change to the CHANGELOG if you want after merging, or I can let you make the change.

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

by vicb at 2013-01-28T16:46:33Z

I am going to change it right now !

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

by vicb at 2013-01-28T16:46:56Z

(and thanks for having checked this)

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

by vicb at 2013-01-28T16:54:37Z

@fabpot I have updated the changelog and the PR header.

I am not sure if the commits should be squashed or not. On one side the multiple commits can help understand the changes but on the other side that's a lot of small commits which could pollute history. I let you choose what to do.
merged branch lyrixx/patch-2 (PR #6898)

This PR was merged into the master branch.

Commits
-------

9718c76 Updated UPGRADE-2.2.md for twig bridge section

Discussion
----------

Updated UPGRADE-2.2.md for twig bridge section

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -
[TwigBridge] added the render tag deprecation to the CHANGELOG for 3.0
[HttpKernel] renamed HttpContentRenderer
[HttpKernel] renamed default strategy to inline
[FrameworkBundle] renamed config file
[HttpKernel] renamed RouterProxyListener