Merge branch '3.1'

xabbuh · xabbuh · commit fb27875f5451 · 2016-07-20T08:04:02.000+02:00
* 3.1:
  after merge fixes
  fix some issues after merging 2.7 into 2.8
  fix another bug due to choosing the wrong branch
  Update some screenshots to wrap them with a browser window
  some minor tweaks
  fix bugs due to choosing the wrong base branch
  complete component cross references
  Updated the Global Composer Installation article
  Removing an index to forms - this seemed to cause big errors in how the index/breadcrumbs were built
  Switching wrong link order
diff --git a/components/asset.rst b/components/asset.rst
@@ -321,4 +321,7 @@ document inside a template::
     echo $packages->getUrl('/resume.pdf', 'doc');
     // result: /somewhere/deep/for/documents/resume.pdf?v1
 
+Learn more
+----------
+
 .. _Packagist: https://packagist.org/packages/symfony/asset
diff --git a/components/browser_kit.rst b/components/browser_kit.rst
@@ -224,5 +224,12 @@ also delete all the cookies::
     // delete history
     $client->restart();
 
+Learn more
+----------
+
+* :doc:`/testing`
+* :doc:`/components/css_selector`
+* :doc:`/components/dom_crawler`
+
 .. _`Packagist`: https://packagist.org/packages/symfony/browser-kit
 .. _`Goutte`: https://github.com/fabpot/Goutte
diff --git a/components/config.rst b/components/config.rst
@@ -28,5 +28,8 @@ Learn More
     :glob:
 
     config/*
+    /bundles/configuration
+    /bundles/extension
+    /bundles/prepend_extension
 
 .. _Packagist: https://packagist.org/packages/symfony/config
diff --git a/components/console.rst b/components/console.rst
@@ -49,7 +49,7 @@ Then, you can register the commands using
 
 See the :doc:`/console` article for information about how to create commands.
 
-Learn More
+Learn more
 ----------
 
 .. toctree::
@@ -59,5 +59,6 @@ Learn More
     /console
     /components/console/*
     /components/console/helpers/index
+    /console/*
 
 .. _Packagist: https://packagist.org/packages/symfony/console
diff --git a/components/css_selector.rst b/components/css_selector.rst
@@ -93,3 +93,9 @@ Several pseudo-classes are not yet supported:
   name (e.g. ``li:first-of-type``) but not with ``*``.
 
 .. _Packagist: https://packagist.org/packages/symfony/css-selector
+
+Learn more
+----------
+
+* :doc:`/testing`
+* :doc:`/components/dom_crawler`
diff --git a/components/dependency_injection.rst b/components/dependency_injection.rst
@@ -293,6 +293,7 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    dependency_injection/*
+    /components/dependency_injection/*
+    /dependency_injection/*
 
 .. _Packagist: https://packagist.org/packages/symfony/dependency-injection
diff --git a/components/dom_crawler.rst b/components/dom_crawler.rst
@@ -466,3 +466,9 @@ the whole form or specific field(s)::
 
 .. _`Goutte`: https://github.com/FriendsOfPHP/Goutte
 .. _Packagist: https://packagist.org/packages/symfony/dom-crawler
+
+Learn more
+----------
+
+* :doc:`/testing`
+* :doc:`/components/css_selector`
diff --git a/components/event_dispatcher.rst b/components/event_dispatcher.rst
@@ -519,7 +519,11 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    event_dispatcher/*
+    /components/event_dispatcher/*
+    /event_dispatcher/*
+
+* :ref:`The kernel.event_listener tag <dic-tags-kernel-event-listener>`
+* :ref:`The kernel.event_subscriber tag <dic-tags-kernel-event-subscriber>`
 
 .. _Mediator: https://en.wikipedia.org/wiki/Mediator_pattern
 .. _Closures: http://php.net/manual/en/functions.anonymous.php
diff --git a/components/expression_language.rst b/components/expression_language.rst
@@ -119,6 +119,9 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    expression_language/*
+    /expressions
+    /components/expression_language/*
+    /service_container/expression_language
+    /reference/constraints/Expression
 
 .. _Packagist: https://packagist.org/packages/symfony/expression-language
diff --git a/components/form.rst b/components/form.rst
@@ -720,6 +720,15 @@ method to access the list of errors. It returns a
     // a FormErrorIterator instance representing the form tree structure
     $errors = $form->getErrors(true, false);
 
+Learn more
+----------
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    /form/*
+
 .. _Packagist: https://packagist.org/packages/symfony/form
 .. _Twig: http://twig.sensiolabs.org
 .. _`Twig Configuration`: http://twig.sensiolabs.org/doc/intro.html
diff --git a/components/http_foundation.rst b/components/http_foundation.rst
@@ -593,7 +593,12 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    http_foundation/*
+    /components/http_foundation/*
+    /controller
+    /controller/*
+    /request/*
+    /session/*
+    /http_cache/*
 
 .. _Packagist: https://packagist.org/packages/symfony/http-foundation
 .. _Nginx: http://wiki.nginx.org/XSendfile
diff --git a/components/http_kernel.rst b/components/http_kernel.rst
@@ -742,6 +742,15 @@ look like this::
         // ...
     }
 
+Learn more
+----------
+
+.. toctree::
+   :maxlength: 1
+   :glob:
+
+   /reference/events
+
 .. _Packagist: https://packagist.org/packages/symfony/http-kernel
 .. _reflection: http://php.net/manual/en/book.reflection.php
 .. _FOSRestBundle: https://github.com/friendsofsymfony/FOSRestBundle
diff --git a/components/intl.rst b/components/intl.rst
@@ -333,6 +333,18 @@ to the current default locale::
 
 That's all you need to know for now. Have fun coding!
 
+Learn more
+----------
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    /reference/forms/types/country
+    /reference/forms/types/currency
+    /reference/forms/types/language
+    /reference/forms/types/locale
+
 .. _Packagist: https://packagist.org/packages/symfony/intl
 .. _Icu component: https://packagist.org/packages/symfony/icu
 .. _intl extension: http://www.php.net/manual/en/book.intl.php
diff --git a/components/routing.rst b/components/routing.rst
@@ -346,4 +346,17 @@ automatically in the background if you want to use it. A basic example of the
     are saved in the ``cache_dir``. This means your script must have write
     permissions for that location.
 
+Learn more
+----------
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    /routing
+    /routing/*
+    /controller
+    /controller/*
+    /configuration/apache_router
+
 .. _Packagist: https://packagist.org/packages/symfony/routing
diff --git a/components/security.rst b/components/security.rst
@@ -45,7 +45,11 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    security/*
+    /components/security/*
+    /security
+    /security/*
+    /reference/configuration/security
+    /reference/constraints/UserPassword
 
 .. _Packagist: https://packagist.org/packages/symfony/security
 .. _`CSRF attacks`: https://en.wikipedia.org/wiki/Cross-site_request_forgery
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -677,6 +677,15 @@ you indicate that you're expecting an array instead of a single object.
     A popular alternative to the Symfony Serializer Component is the third-party
     library, `JMS serializer`_ (released under the Apache license, so incompatible with GPLv2 projects).
 
+Learn more
+----------
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    /serializer
+
 .. _`JMS serializer`: https://github.com/schmittjoh/serializer
 .. _Packagist: https://packagist.org/packages/symfony/serializer
 .. _RFC3339: https://tools.ietf.org/html/rfc3339#section-5.8
diff --git a/components/templating.rst b/components/templating.rst
@@ -208,6 +208,8 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    templating/*
+    /components/templating/*
+    /templating
+    /templating/*
 
 .. _Packagist: https://packagist.org/packages/symfony/templating
diff --git a/components/translation.rst b/components/translation.rst
@@ -219,7 +219,10 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    translation/*
+    /components/translation/*
+    /translation
+    /translation/*
+    /validation/translation
 
 .. _Packagist: https://packagist.org/packages/symfony/translation
 .. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
diff --git a/components/validator.rst b/components/validator.rst
@@ -17,4 +17,15 @@ You can install the component in 2 different ways:
 
 For more information, see the code in the Git Repository.
 
+Learn more
+----------
+
+.. toctree::
+   :maxdepth: 1
+   :glob:
+
+   /validation
+   /validation/*
+   /reference/constraints/*
+
 .. _Packagist: https://packagist.org/packages/symfony/validator
diff --git a/configuration.rst b/configuration.rst
@@ -388,11 +388,6 @@ And the many other topics.
 Learn more
 ----------
 
-.. toctree::
-    :hidden:
-
-    forms
-
 .. toctree::
     :maxdepth: 1
     :glob:
diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst
@@ -39,6 +39,8 @@ while you're reading the Symfony documentation.
 and you'll be redirected to GitHub:
 
 .. image:: /_images/contributing/docs-github-edit-page.png
+   :align: center
+   :class: with-browser
 
 **Step 2.** Edit the contents, describe your changes and click on the
 **Propose file change** button.
@@ -48,6 +50,8 @@ and you'll be redirected to GitHub:
 also display a preview of your changes:
 
 .. image:: /_images/contributing/docs-github-create-pr.png
+   :align: center
+   :class: with-browser
 
 If everything is correct, click on the **Create pull request** button.
 
diff --git a/controller/error_pages.rst b/controller/error_pages.rst
@@ -15,13 +15,17 @@ with lots of debug information to help you quickly discover the root problem:
 
 .. image:: /_images/controller/error_pages/exceptions-in-dev-environment.png
    :alt: A typical exception page in the development environment
+   :align: center
+   :class: with-browser
 
 Since these pages contain a lot of sensitive internal information, Symfony won't
 display them in the production environment. Instead, it'll show a simple and
 generic **error page**:
 
 .. image:: /_images/controller/error_pages/errors-in-prod-environment.png
    :alt: A typical error page in the production environment
+   :align: center
+   :class: with-browser
 
 Error pages for the production environment can be customized in different ways
 depending on your needs:
@@ -251,19 +255,19 @@ will be passed two parameters:
 Instead of creating a new exception controller from scratch you can, of course,
 also extend the default :class:`Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController`.
 In that case, you might want to override one or both of the ``showAction()`` and
-``findTemplate()`` methods. The latter one locates the template to be used. 
+``findTemplate()`` methods. The latter one locates the template to be used.
 
 .. note::
-  
+
     In case of extending the
     :class:`Symfony\\Bundle\\TwigBundle\\Controller\\ExceptionController` you
     may configure a service to pass the Twig environment and the ``debug`` flag
-    to the constructor. 
-    
+    to the constructor.
+
     .. configuration-block::
-    
+
         .. code-block:: yaml
-    
+
             # app/config/services.yml
             services:
                 app.exception_controller:
diff --git a/form/action_method.rst b/form/action_method.rst
@@ -49,7 +49,9 @@ to the ``form()`` or the ``form_start()`` helper functions:
 
         <!-- app/Resources/views/default/newAction.html.php -->
         <?php echo $view['form']->start($form, array(
-            'action' => $view['router']->generate('target_route'),
+            // The path() method was introduced in Symfony 2.8. Prior to 2.8,
+            // you had to use generate().
+            'action' => $view['router']->path('target_route'),
             'method' => 'GET',
         )) ?>
 
diff --git a/form/type_guesser.rst b/form/type_guesser.rst
@@ -215,7 +215,6 @@ creating a service and tagging it as ``form.type_guesser``:
             ->addTag('form.type_guesser')
         ;
 
-
 .. sidebar:: Registering a Type Guesser in the Component
 
     If you're using the Form component standalone in your PHP project, use
diff --git a/http_cache/esi.rst b/http_cache/esi.rst
@@ -149,7 +149,10 @@ matter), Symfony uses the standard ``render`` helper to configure ESI tags:
 
         <!-- ... or a URL -->
         <?php echo $view['actions']->render(
-            $view['router']->generate('latest_news', array('maxPerPage' => 5)),
+            $view['router']->path(
+                'latest_news',
+                array('maxPerPage' => 5)
+            ),
             array('strategy' => 'esi'),
         ) ?>
 
diff --git a/page_creation.rst b/page_creation.rst
@@ -240,8 +240,8 @@ way of building beautiful, functional, fast and maintainable apps.
 
 Ok, time to finish mastering the fundamentals by reading these chapters:
 
-* :doc:`/controller`
 * :doc:`/routing`
+* :doc:`/controller`
 * :doc:`/templating`
 
 Then, learn about other important topics like the
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -175,13 +175,15 @@ developer's best friend!
 
 .. image:: /_images/quick_tour/web_debug_toolbar.png
    :align: center
+   :class: with-browser
 
 But what you see initially is only the tip of the iceberg; click on any
 of the bar sections to open the profiler and get much more detailed information
 about the request, the query parameters, security details and database queries:
 
 .. image:: /_images/quick_tour/profiler.png
    :align: center
+   : class: with-browser
 
 This tool provides so much internal information about your application that
 you may be worried about your visitors accessing sensible information. Symfony
diff --git a/routing/generate_url_javascript.rst b/routing/generate_url_javascript.rst
@@ -16,7 +16,7 @@ variables. The ``escape`` function helps escape any non-JavaScript-safe values:
 
         <script>
         var route = "<?php echo $view->escape(
-            $view['router']->generate('blow_show', array(
+            $view['router']->path('blog_show', array(
                 'slug' => 'my-blog-post',
             )),
             'js'
diff --git a/setup.rst b/setup.rst
@@ -144,6 +144,7 @@ Welcome Page of Symfony:
 .. image:: /_images/quick_tour/welcome.png
    :align: center
    :alt:   Symfony Welcome Page
+   :class: with-browser
 
 If you see a blank page or an error page instead of the Welcome Page, there is
 a directory permission misconfiguration. The solution to this problem is
diff --git a/setup/composer.rst b/setup/composer.rst
diff --git a/setup/file_permissions.rst b/setup/file_permissions.rst
diff --git a/setup/upgrade_major.rst b/setup/upgrade_major.rst
diff --git a/templating/formats.rst b/templating/formats.rst
diff --git a/templating/render_without_controller.rst b/templating/render_without_controller.rst
