Skip to content

Commit

Permalink
tweaked docs for previous merge
Browse files Browse the repository at this point in the history
  • Loading branch information
lsmith77 committed Aug 15, 2014
1 parent 078f9b6 commit 0649a4c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion Resources/doc/3-listener-support.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,8 @@ will be delegated to [SensioFrameworkExtraBundle][sensio-extra-bundle].

Note that it is necessary to disable view annotations in
[SensioFrameworkExtraBundle][sensio-extra-bundle] so that FOSRestBundle can take over the handling.
However FOSRestBundle will do this automatically but it does not override any explicit
configuration. So make sure to remove or disable the following setting:

```yaml
# app/config/config.yml
Expand All @@ -75,7 +77,6 @@ fos_rest:

sensio_framework_extra:
view: { annotations: false }
router: { annotations: true }
```
```php
Expand Down

0 comments on commit 0649a4c

Please sign in to comment.