Merge branch '2.7' into 2.8

Author: wouterj

includes/_rewrite_rule_tip.rst.inc renamed to _includes/_rewrite_rule_tip.rst.inc

@@ -5,7 +5,7 @@ Configuring a Web Server
 ========================
 
 The preferred way to develop your Symfony application is to use
-:doc:`PHP's internal web server </web_server/built_in>`. However,
+:doc:`PHP's internal web server </set_up/built_in_web_server>`. However,
 when using an older PHP version or when running the application in the production
 environment, you'll need to use a fully-featured web server. This article
 describes several ways to use Symfony with Apache or Nginx.

includes/service_container/_my_mailer.rst.inc renamed to _includes/service_container/_my_mailer.rst.inc

@@ -18,7 +18,7 @@ Before Running the Tests
 
 To run the Symfony test suite, install the external dependencies used during the
 tests, such as Doctrine, Twig and Monolog. To do so,
-:doc:`install Composer </composer/installation>` and execute the following:
+:doc:`install Composer </set_up/composer>` and execute the following:
 
 .. code-block:: bash
 

configuration/web_server_configuration.rst

@@ -212,7 +212,7 @@ to the controller:
         return $collection;
 
 Now, you can go to ``/hello/ryan`` (e.g. ``http://localhost:8000/hello/ryan``
-if you're using the :doc:`built-in web server </web_server/built_in>`)
+if you're using the :doc:`built-in web server </set_up/built_in_web_server>`)
 and Symfony will execute the ``HelloController::indexAction()`` controller
 and pass in ``ryan`` for the ``$name`` variable. Creating a "page" means
 simply creating a controller method and an associated route.

contributing/code/tests.rst

@@ -15,3 +15,14 @@ method to check the validity of a CSRF token::
             // ... do something, like deleting an object
         }
     }
+
+.. versionadded:: 2.6
+    The ``isCsrfTokenValid()`` shortcut method was introduced in Symfony 2.6.
+    It is equivalent to executing the following code:
+
+    .. code-block:: php
+
+        use Symfony\Component\Security\Csrf\CsrfToken;
+
+        $this->get('security.csrf.token_manager')
+            ->isTokenValid(new CsrfToken('token_id', 'TOKEN'));

controller.rst

@@ -94,7 +94,7 @@ Dependency Management
 
 To install the Symfony Components that you need for your framework, you are going
 to use `Composer`_, a project dependency manager for PHP. If you don't have it
-yet, :doc:`download and install Composer </composer/installation>` now.
+yet, :doc:`download and install Composer </set_up/composer>` now.
 
 Our Project
 -----------

controller/csrf_token_validation.rst

@@ -12,7 +12,7 @@ them by executing any piece of code.
 Internal events provided by Symfony itself are defined in the
 :class:`Symfony\\Component\\HttpKernel\\KernelEvents` class. Third-party bundles
 and libraries also trigger lots of events and your own application can trigger
-:doc:`custom events </components/event_dispatcher/index>`.
+:doc:`custom events </components/event_dispatcher>`.
 
 All the examples shown in this article use the same ``KernelEvents::EXCEPTION``
 event for consistency purposes. In your own application, you can use any event

create_framework/introduction.rst

@@ -321,7 +321,7 @@ handles every request coming into your application. For example:
 | ``/index.php/blog``    | executes ``index.php`` |
 +------------------------+------------------------+
 
-.. include:: /includes/_rewrite_rule_tip.rst.inc
+.. include:: /_includes/_rewrite_rule_tip.rst.inc
 
 Now, every request is handled exactly the same way. Instead of individual URLs
 executing different PHP files, the front controller is *always* executed,

event_dispatcher/event_listener.rst

@@ -11,13 +11,7 @@ Symfony Documentation
     page_creation
     introduction/from_flat_php_to_symfony2
     introduction/symfony1
-    propel/propel
-    psr/psr7
-    upgrade/index
-    web_server/index
     web_services/index
-    workflow/index
-    composer/installation
 
 Quick Tour
 ----------
@@ -85,6 +79,7 @@ Advanced Topics
     profiler
     request
     session
+    set_up
 
 Best Practices
 --------------