Merge branch '2.7' into 2.8

* 2.7:
  minor #7613 Twig Extensions Reference minor brush-up (mpdude)
  Update Title in controller.rst
  Update scheme.rst
  Update requirements.rst
  [#7845] minor tweaks
  Update translation_domain.rst.inc
  Update page_creation.rst to correct hidden colon
  Update forms.rst
  Minor reword
  Update deployment.rst
  KernelTestCase::createKernel() is static, $this->createKernel() -> static::createKernel()
  Better explain how to enable the validation component and its annotations
  Fix the link to ConEmu (it is now hosted on GitHub)
  Add annotation examples to match a route based on the host
  Minor reword to improve readability
  Minor reword and reformatting
  Add security stateless tip
  typo

Author: xabbuh

console.rst

@@ -273,7 +273,7 @@ you can extend your test from
     {
         public function testExecute()
         {
-            $kernel = $this->createKernel();
+            $kernel = static::createKernel();
             $kernel->boot();
 
             $application = new Application($kernel);

contributing/code/tests.rst

@@ -55,6 +55,6 @@ what's going on and if the tests are broken because of the new code.
     to see colored test results.
 
 .. _Cmder: http://cmder.net/
-.. _ConEmu: https://code.google.com/p/conemu-maximus5/
+.. _ConEmu: https://conemu.github.io/
 .. _ANSICON: https://github.com/adoxa/ansicon/releases
 .. _Mintty: https://mintty.github.io/

controller.rst

@@ -237,7 +237,7 @@ The Symfony templating system and Twig are explained more in the
 
 .. _controller-accessing-services:
 
-Accessing other Services
+Accessing Other Services
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 Symfony comes packed with a lot of useful objects, called *services*. These

deployment.rst

@@ -80,7 +80,7 @@ specifically tailored to the requirements of Symfony.
 `Capistrano`_ with `Symfony plugin`_
     `Capistrano`_ is a remote server automation and deployment tool written in Ruby.
     `Symfony plugin`_ is a plugin to ease Symfony related tasks, inspired by `Capifony`_
-    (which works only with Capistrano 2 )
+    (which works only with Capistrano 2).
 
 `sf2debpkg`_
     Helps you build a native Debian package for your Symfony project.
@@ -181,12 +181,12 @@ setup:
 * Pushing assets to a CDN
 * ...
 
-Application Lifecycle: Continuous Integration, QA, etc
-------------------------------------------------------
+Application Lifecycle: Continuous Integration, QA, etc.
+-------------------------------------------------------
 
 While this entry covers the technical details of deploying, the full lifecycle
-of taking code from development up to production may have a lot more steps
-(think deploying to staging, QA (Quality Assurance), running tests, etc).
+of taking code from development up to production may have more steps:
+deploying to staging, QA (Quality Assurance), running tests, etc.
 
 The use of staging, testing, QA, continuous integration, database migrations
 and the capability to roll back in case of failure are all strongly advised. There

forms.rst

@@ -61,7 +61,7 @@ to do with Symfony or any other library. It's quite simply a normal PHP object
 that directly solves a problem inside *your* application (i.e. the need to
 represent a task in your application). Of course, by the end of this article,
 you'll be able to submit data to a ``Task`` instance (via an HTML form), validate
-its data, and persist it to the database.
+its data and persist it to the database.
 
 .. index::
    single: Forms; Create a form in a controller
@@ -116,7 +116,7 @@ from inside a controller::
 
 Creating a form requires relatively little code because Symfony form objects
 are built with a "form builder". The form builder's purpose is to allow you
-to write simple form "recipes", and have it do all the heavy-lifting of actually
+to write simple form "recipes" and have it do all the heavy-lifting of actually
 building the form.
 
 In this example, you've added two fields to your form - ``task`` and ``dueDate`` -
@@ -278,7 +278,7 @@ your controller::
     to the ``submit()`` method - a strategy which is deprecated and will be
     removed in Symfony 3.0. For details on that method, see :ref:`form-submit-request`.
 
-This controller follows a common pattern for handling forms, and has three
+This controller follows a common pattern for handling forms and has three
 possible paths:
 
 #. When initially loading the page in a browser, the form is created and

introduction/from_flat_php_to_symfony2.rst

@@ -370,7 +370,7 @@ on the requested URI::
         echo '<html><body><h1>Page Not Found</h1></body></html>';
     }
 
-For organization, both controllers (formerly ``index.php`` and ``show.php``)
+For organization, both controllers (formerly ``/index.php`` and ``/index.php/show``)
 are now PHP functions and each has been moved into a separate file named ``controllers.php``::
 
     // controllers.php

page_creation.rst

@@ -79,7 +79,7 @@ to creating a page?
    in its own section, including how to make *variable* URLs;
 
 #. *Create a controller*: The method below the route - ``numberAction()`` - is called
-   the *controller*: this is a function where *you* build the page and ultimately
+   the *controller*. This is a function where *you* build the page and ultimately
    return a ``Response`` object. You'll learn more about :doc:`controllers </controller>`
    in their own section, including how to return JSON responses.
 

reference/configuration/security.rst

@@ -661,6 +661,13 @@ multiple firewalls, the "context" could actually be shared:
             ),
         ));
 
+.. note::
+
+    The firewall context key is stored in session, so every firewall using it
+    must set its ``stateless`` option to ``false``. Otherwise, the context is
+    ignored and you won't be able to authenticate on multiple firewalls at the
+    same time.
+
 HTTP-Digest Authentication
 --------------------------
 

reference/forms/types/options/translation_domain.rst.inc

@@ -1,7 +1,9 @@
 translation_domain
 ~~~~~~~~~~~~~~~~~~
 
-**type**: ``string`` **default**: ``messages``
+**type**: ``string``, ``null`` or ``false``  **default**: ``null``
 
-This is the translation domain that will be used for any labels or options
-that are rendered for this field.
+This is the translation domain that will be used for any label or option
+that is rendered for this field. Use ``null`` to reuse the translation domain
+of the parent form (or the default domain of the translator for the root
+form). Use ``false`` to disable translations.

reference/twig_reference.rst

@@ -7,16 +7,32 @@ Symfony Twig Extensions
 =======================
 
 Twig is the default template engine for Symfony. By itself, it already contains
-a lot of built-in functions, filters, tags and tests (learn more about them
-from the `Twig Reference`_).
+a lot of built-in functions, filters, tags and tests. You can learn more about
+them from the `Twig Reference`_.
 
-Symfony adds custom extensions on top of Twig to integrate some components
-into the Twig templates. The following sections describe the custom
-:ref:`functions <reference-twig-functions>`, :ref:`filters <reference-twig-filters>`,
-:ref:`tags <reference-twig-tags>` and :ref:`tests <reference-twig-tests>`
-that are available when using the Symfony Core Framework.
+The Symfony framework adds quite a few extra :ref:`functions <reference-twig-functions>`,
+:ref:`filters <reference-twig-filters>`, :ref:`tags <reference-twig-tags>`
+and :ref:`tests <reference-twig-tests>` to seamlessly integrate the
+various Symfony components with Twig templates. The following sections
+describe these extra features.
 
-There may also be tags in bundles you use that aren't listed here.
+.. tip::
+
+    Technically, most of the extensions live in the `Twig Bridge`_. That code
+    might give you some ideas when you need to write your own Twig extension
+    as described in :doc:`/templating/twig_extension`.
+
+.. note::
+
+    This reference only covers the Twig extensions provided by the Symfony
+    framework. You are probably using some other bundles as well, and
+    those might come with their own extensions not covered here.
+
+.. tip::
+
+    The `Twig Extensions repository`_ contains some additional Twig extensions
+    that do not belong to the Twig core, so you might want to have a look at
+    the `Twig Extensions documentation`_.
 
 .. _reference-twig-functions:
 
@@ -756,8 +772,11 @@ Symfony Standard Edition Extensions
 The Symfony Standard Edition adds some bundles to the Symfony Core Framework.
 Those bundles can have other Twig extensions:
 
-* **Twig Extensions** includes some interesting extensions that do not belong
-  to the Twig core. You can read more in `the official Twig Extensions documentation`_.
+* **Assetic** adds the ``{% stylesheets %}``, ``{% javascripts %}`` and
+  ``{% image %}`` tags. You can read more about them in
+  :doc:`the Assetic Documentation </assetic/asset_management>`.
 
 .. _`Twig Reference`: http://twig.sensiolabs.org/documentation#reference
-.. _`the official Twig Extensions documentation`: http://twig-extensions.readthedocs.io/
+.. _`Twig Extensions repository`: https://github.com/twigphp/Twig-extensions
+.. _`Twig Extensions documentation`: http://twig-extensions.readthedocs.io/en/latest/
+.. _`Twig Bridge`: https://github.com/symfony/symfony/tree/master/src/Symfony/Bridge/Twig/Extension