Merge branch '2.3' into 2.6

* 2.3: (55 commits)
  Update data_collector.rst
  Updated types articles
  Reviewed form type options includes
  Update authentication.rst
  Update authentication.rst
  Remove Serial Comma
  Update validation.rst
  Improve Choice Validation Constraint Example
  Clarify `query_builder` closure return type
  Remove indentations for all-whitespace lines.
  Fix incorrect instructions regarding linking to the "full panel", improve roll-over data example.
  Flesh out twig-template for custom data-collector
  Simply moving new section down a little lower - I believe some of the other options are a bit more common (totally subjective)
  another fix!
  Fixing things thanks to Wouter
  Tweaks to the new using commands in a controller article
  Many tweaks thanks to the team!
  re-adding literals
  no change - breaking the lines a little earlier, per our standard
  Documentation about using Command in Controller
  ...

Author: weaverryan

best_practices/web-assets.rst

@@ -29,8 +29,8 @@ much more concise:
 .. note::
 
     Keep in mind that ``web/`` is a public directory and that anything stored
-    here will be publicly accessible. For that reason, you should put your
-    compiled web assets here, but not their source files (e.g. SASS files).
+    here will be publicly accessible, including all the original asset files
+    (e.g. Sass, LESS and CoffeScript files).
 
 Using Assetic
 -------------
@@ -51,16 +51,15 @@ tools like GruntJS.
 
 :doc:`Assetic </cookbook/assetic/asset_management>` is an asset manager capable
 of compiling assets developed with a lot of different frontend technologies
-like LESS, Sass and CoffeeScript.
-Combining all your assets with Assetic is a matter of wrapping all the assets
-with a single Twig tag:
+like LESS, Sass and CoffeeScript. Combining all your assets with Assetic is a
+matter of wrapping all the assets with a single Twig tag:
 
 .. code-block:: html+jinja
 
     {% stylesheets
         'css/bootstrap.min.css'
         'css/main.css'
-        filter='cssrewrite' output='css/compiled/all.css' %}
+        filter='cssrewrite' output='css/compiled/app.css' %}
         <link rel="stylesheet" href="{{ asset_url }}" />
     {% endstylesheets %}
 
@@ -69,7 +68,7 @@ with a single Twig tag:
     {% javascripts
         'js/jquery.min.js'
         'js/bootstrap.min.js'
-        output='js/compiled/all.js' %}
+        output='js/compiled/app.js' %}
         <script src="{{ asset_url }}"></script>
     {% endjavascripts %}
 

book/index.rst

@@ -21,6 +21,5 @@ The Book
     translation
     service_container
     performance
-    internals
 
 .. include:: /book/map.rst.inc