Merge remote-tracking branch 'origin/master' into di-3.3-changes

* origin/master: (36 commits) Use the short Yaml syntax for service definition [#7613] remove reference to AsseticBundle minor #7613 Twig Extensions Reference minor brush-up (mpdude) Fix service locator declaration Minor reword Update Title in controller.rst Update scheme.rst Update requirements.rst [3.3] Document FQCN named controllers Document FQCN named controllers Use the short tag syntax [#7845] minor tweaks Update translation_domain.rst.inc Update page_creation.rst to correct hidden colon Update forms.rst Rewords Fixed the form types of the buttons in the Form reference [#7832] use bin/console for Symfony 3.x Minor reword Update deployment.rst ...
symfony · weaverryan · May 5, 2017 · Apr 15, 2017 · Apr 28, 2017 · Apr 28, 2017
commit cac3c6c3241796212576425253ada45c13d03fc0
diff --git a/controller.rst b/controller.rst
@@ -236,6 +236,7 @@ The Symfony templating system and Twig are explained more in the
    single: Controller; Accessing services
 
 .. _controller-accessing-services:
+.. _accessing-other-services:
 
 Fetching Services as Arguments
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

diff --git a/service_container.rst b/service_container.rst
@@ -220,7 +220,7 @@ be its class name in this case::
     {
         public function newAction()
         {
-            // $messageGenerator = $this->get(MessageGenerator::class);
+            $messageGenerator = $this->get(MessageGenerator::class);
 
             $message = $messageGenerator->getHappyMessage();
             $this->addFlash('success', $message);