Fixed typo in UglifyCss usage example
Merge pull request #2630 from WouterJ/document_stopwatch_helper

[WCM] Added stopwatch tag
[#2630] Tweaks for new stopwatch tag - updating version, syntax for using it, and wrong bundle name
[#2855] Trying to make the .first and .second sub-field names a bit more clear
Merge pull request #2859 from dosten/reference_stable_version

Referenced oldest but still maintained version in contributing documenta...
Merge pull request #2863 from WouterJ/issue_2858

Added docs about immutable dispatcher
[#2863] Fixing some ordering of documents
Merge pull request #2864 from WouterJ/issue_2833

Documented htmlPattern option
[#2864] Small tweaks thanks to @xabbuh on new Regex:htmlPattern option docs
Merge pull request #2867 from WouterJ/issue_2331

Unified autoloading in Sf2 <> Sf1 article
[#2867] Minor tweaks
Merge branch '2.1' into 2.2

Conflicts:
	components/event_dispatcher/introduction.rst
	cookbook/symfony1.rst
Merge branch '2.2' into 2.3

Conflicts:
	reference/configuration/framework.rst
Merge branch '2.3'
Removing several "2.1" references, which is consistent with our release process:

"Remove all versionadded directives - and any other notes related to features changing or being new - for the version (e.g. 2.1) from the master branch. The result is that the next release (which is the first that comes entirely after the end of maintenance of this branch), will have no mentions of the old version (e.g. 2.1)."

This should have been done when 2.1 reached end of maintenance, but the release process wasn't formed at that time.

Also, the release of 2.3 and the end of maintenance for 2.1 were unique because they basically happened at the same time. For our purposes, we assume that 2.3 was released before the 2.1 end of life, which means that the 2.1 references are removed for 2.4 (master), not for 2.3.
Documented services as global vars
[#2865] No change other than moving the parameters section above the services section per a suggestion by @Stof, which I agree with (that parameters are more common to use as global Twig variables)
[#2865] Minor proofreading and tweaks thanks to @xabbuh and @stof about the services as global Twig variables
Merge branch '2.2' into 2.3
Merge branch '2.3'