[Acme] Highlight code block in demo pages
Remove specific autoloading part to reflect latest Symfony master
bumped symfony version
disabled the profiler in the test environment to speed up tests
updated deps
merged branch lyrixx/highlight (PR #386)

Commits
-------

dbfb751 [Acme] Highlight code block in demo pages

Discussion
----------

[Acme] Highlight code block in demo pages

This feature is not very important, but it's fun :tropical_drink:.

P.S. : `htmlspecialchars` is not needed anymore, `highlight_string` already escape (I guess)
Improve wording of the comment about ApcClassLoader in app.php
merged branch bantu/ApcClassLoader-Comment-Improvements (PR #385)

Commits
-------

e3e652a Improve wording of the comment about ApcClassLoader in app.php

Discussion
----------

Apc class loader comment improvements

Apc class loader comment improvements. No code changes.

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

by fabpot at 2012-09-19T04:42:11Z

Can you remove the APC abbr explanation as nobody ever uses it and squash your commits before I merge? Thanks.

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

by Baachi at 2012-09-19T07:11:33Z

That's not needed anymore. Composer optimized the autoloading already.
And a classmap is faster than apc. @Seldaek did some [benchmarks](https://github.com/Seldaek/autoload-bench) to compare different autoloading methods.

:-1: for this PR

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

by Seldaek at 2012-09-19T08:13:55Z

@Baachi The upside to this PR is that if people aren't aware of composer's feature, they can still get a speed boost by enabling this. The APC one is almost as fast and if you have a ginormous amount of classes it might be preferable memory wise. Depends on your setup I suppose.

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

by lsmith77 at 2012-09-19T08:23:36Z

@Seldaek this stuff should also be mentioned in http://symfony.com/doc/current/book/performance.html

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

by Seldaek at 2012-09-19T08:26:55Z

Yes it should. Any volunteer? :p

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

by bantu at 2012-09-19T09:59:19Z

Threw away 040c861 and merged 4953776 into b154c85 as requested.
updated some bundles to 2.2
updated deps
merged branch jalliot/autoloader-update (PR #387)

This PR was merged into the master branch.

Commits
-------

cc5c5be Remove specific autoloading part to reflect latest Symfony master

Discussion
----------

Remove specific autoloading part to reflect latest Symfony master

Before merging this PR:
* Merge symfony/symfony#5213
* Update vendors

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

by jalliot at 2012-08-08T21:09:56Z

Updated for latest symfony/symfony#5213

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

by bamarni at 2012-10-01T13:06:47Z

@fabpot: you closed this PR without merging it :)

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

by fabpot at 2012-10-02T16:35:57Z

I've not closed that myself. Github probably did ;)
Merge branch '2.1'

* 2.1:
  You cannot start a Plain Style Scalar with an Indicator (%). Plain Style Scalars which have a leading % should be changed to double-quote style scalars.
  Correcting YAML Markup in app/config to be valid YAML 1.2o
  Update README.md
  updated VENDORS for 2.1.2
  finished reverting previous changes
  reverted unwanted changes
  updated deps
  Download Composer from a secure source
  added .travis.yml
  updated VENDORS for 2.1.1
  Revert "merged branch Tobion/patch-1 (PR #397)"
  fixed composer file
  Fixed an issue with installs from composer not working due to version conflict on symfony/symfony
  Add reference to PHP bug #62874 for 5.3.16 requirement
  Add more verbose warning for PHP 5.3.16
re-added travis file (missing due to a bad merge, refs #432)
Update app/config/config_test.yml

Fix config typo
merged branch michelsalib/patch-1 (PR #435)

This PR was merged into the master branch.

Commits
-------

14a6d3f Update app/config/config_test.yml

Discussion
----------

Fix app/config/config_test.yml

The `enable` should be `enabled`. See here https://github.com/symfony/symfony/blob/master/src/Symfony/Component/Config/Definition/Builder/ArrayNodeDefinition.php#L220
Update app/config/config.yml

Adding note about sqlite databases needing a path parameter
merged branch arse/master (PR #436)

This PR was merged into the master branch.

Commits
-------

421e330 Update app/config/config.yml

Discussion
----------

Note about sqlite needing path param

Adding note about sqlite databases needing a path parameter to config.yml
Merge branch '2.1'

* 2.1:
  fixed links in the UPGRADE file (closes #431)
  added fe80::1 as a local IP address in config.php
  Add fe80::1 to list of loopback addresses.
  updated VENDORS for 2.1.3

Conflicts:
	composer.lock
Merge branch '2.1'

* 2.1:
  Changed assertion to be more specific
  Close not closed div tag in config.php (closes #378)
  updated vendors to dev branches
  updated VENDORS for 2.0.18
  updated vendors to dev branches
  updated VENDORS for 2.0.17
  Extra spaces removed in bin/vendors
  Update bin/vendors
  Update bin/vendors
  updated vendors
  updated deps
  simplified code
  updated Swiftmailer to 4.2.0
  updated vendors to dev branches
  updated VENDORS for 2.0.15
  updated vendors to dev branches
  updated VENDORS for 2.0.14
  updated vendors to dev branches
  updated VENDORS for 2.0.13
Merge branch '2.1'

* 2.1:
  changed the default host fomr localhost to 127.0.0.1 (closes symfony/symfony#5987)
  changed the Composer min-stability to stable (closes #420, #402)

Conflicts:
	composer.json
	composer.lock