Merge pull request #1731 from simensen/controller_as_service_annotated

Controller as a service when using annotated routing
[components] Fixing some build errors with the DI workflow
[#1731] Tweaking the note about controllers as services with annotation routing
Merge pull request #1743 from richardmiller/adding_link_to_routing_annotations

Adding link to using annotations from routing book page
[#1743] Tweaks to link to external bundle doc
Merge pull request #1744 from richardmiller/fixing_line_lengths_in_di

Fixing line length to avoid horizontal scrolling in DI component
Merge branch '2.0' into 2.1
Update book/security.rst

fixing examples of in_memory provider, "memory" key was missing 
Merge pull request #1747 from shieldo/fix_casing

fixed casing in a method call
Merge pull request #1748 from richardmiller/changing_use_of_we

Changing some uses of we to you to be in keeping with the usual style
Merge branch 'master' into 2.1
Merge pull request #1752 from richardmiller/moving_doctrine_tip

Moving sidebar below introduction of related command
routing/working with message obj/dot instead of period
Merge branch 'adding_php_to_console_examples' of git://github.com/richardmiller/symfony-docs into richardmiller-adding_php_to_console_examples

Conflicts:
	book/doctrine.rst
Extended usage example for entity form type.

Hint (and example usage) about property option if no __toString() method is provided by the entity object. Otherwise new users could be irritated.
Merge branch '2.0' into 2.1

Conflicts:
	book/doctrine.rst
Remove "s" from constraint as it's wrong path

Changes from 
    use Symfony\Component\Security\Core\Validator\Constraints as SecurityAssert;
to 
    use Symfony\Component\Security\Core\Validator\Constraint as SecurityAssert;
Merge pull request #1761 from marekkalnik/2.0

Fix bad function name in console testing
[component][console] Initial documentation to support symfony/symfony#3501
[#1765] Making a few tweaks to the console progress update thanks to @lyrixx, @stof and @WouterJ