Docs re-org and removal of small sections

_build/redirection_map

@@ -76,13 +76,20 @@
 /book/configuration /configuration
 /book/propel /propel/propel
 /book/performance /performance
-/cookbook/assetic/apply_to_option /assetic/apply_to_option
-/cookbook/assetic/asset_management /assetic/asset_management
-/cookbook/assetic/index /assetic
-/cookbook/assetic/jpeg_optimize /assetic/jpeg_optimize
-/cookbook/assetic/php /assetic/php
-/cookbook/assetic/uglifyjs /assetic/uglifyjs
-/cookbook/assetic/yuicompressor /assetic/yuicompressor
+/cookbook/assetic/apply_to_option /frontend/assetic/apply_to_option
+/cookbook/assetic/asset_management /frontend/assetic/asset_management
+/cookbook/assetic/index /frontend/assetic
+/cookbook/assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
+/cookbook/assetic/php /frontend/assetic/php
+/cookbook/assetic/uglifyjs /frontend/assetic/uglifyjs
+/cookbook/assetic/yuicompressor /frontend/assetic/yuicompressor
+/assetic /frontend/assetic
+/assetic/apply_to_option /frontend/assetic/apply_to_option
+/assetic/asset_management /frontend/assetic/asset_management
+/assetic/jpeg_optimize /frontend/assetic/jpeg_optimize
+/assetic/php /frontend/assetic/php
+/assetic/uglifyjs /frontend/assetic/uglifyjs
+/assetic/yuicompressor /frontend/assetic/yuicompressor
 /cookbook/bundles/best_practices /bundles/best_practices
 /cookbook/bundles/configuration /bundles/configuration
 /cookbook/bundles/extension /bundles/extension
@@ -150,7 +157,8 @@
 /cookbook/event_dispatcher/event_listener /event_dispatcher
 /cookbook/event_dispatcher/index /event_dispatcher
 /cookbook/event_dispatcher/method_behavior /event_dispatcher/method_behavior
-/cookbook/expressions /expressions/expressions
+/cookbook/expressions /security/expressions
+/expressions /security/expressions
 /cookbook/form/create_custom_field_type /form/create_custom_field_type
 /cookbook/form/create_form_type_extension /form/create_form_type_extension
 /cookbook/form/data_transformers /form/data_transformers
@@ -181,10 +189,10 @@
 /cookbook/profiler/matchers /profiler/matchers
 /cookbook/profiler/profiling_data /profiler/profiling_data
 /cookbook/profiler/storage /profiler/storage
-/cookbook/psr7 /request/psr7
+/cookbook/psr7 /components/psr7
 /cookbook/request/index /request
-/cookbook/request/load_balancer_reverse_proxy /request/load_balancer_reverse_proxy
-/cookbook/request/mime_type /request/mime_type
+/cookbook/request/load_balancer_reverse_proxy /deployment/proxies
+/cookbook/request/mime_type /reference/configuration/framework#formats
 /cookbook/routing/conditions /routing/conditions
 /cookbook/routing/custom_route_loader /routing/custom_route_loader
 /cookbook/routing/debug /routing/debug
@@ -303,6 +311,7 @@
 /components/form/type_guesser /form/type_guesser
 /components/http_foundation/index /components/http_foundation
 /components/http_foundation/introduction /components/http_foundation
+/components/http_foundation/trusting_proxies /deployment/proxies
 /components/http_kernel/introduction /components/http_kernel
 /components/http_kernel/index /components/http_kernel
 /components/property_access/introduction /components/property_access
@@ -327,3 +336,4 @@
 /form /forms
 /testing/simulating_authentication /testing/http_authentication
 /validation/group_service_resolver /form/validation_group_service_resolver
+/request/load_balancer_reverse_proxy /deployment/proxies

best_practices/web-assets.rst

@@ -49,7 +49,7 @@ tools like GruntJS.
     Use Assetic to compile, combine and minimize web assets, unless you're
     comfortable with frontend tools like GruntJS.
 
-:doc:`Assetic </assetic/asset_management>` is an asset manager capable
+:doc:`Assetic </frontend/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:
@@ -87,8 +87,8 @@ Learn More about Assetic
 ------------------------
 
 Assetic can also minimize CSS and JavaScript assets
-:doc:`using UglifyCSS/UglifyJS </assetic/uglifyjs>` to speed up your
-websites. You can even :doc:`compress images </assetic/jpeg_optimize>`
+:doc:`using UglifyCSS/UglifyJS </frontend/assetic/uglifyjs>` to speed up your
+websites. You can even :doc:`compress images </frontend/assetic/jpeg_optimize>`
 with Assetic to reduce their size before serving them to the user. Check out
 the `official Assetic documentation`_ to learn more about all the available
 features.

components/expression_language.rst

@@ -119,7 +119,6 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    /expressions
     /components/expression_language/*
     /service_container/expression_language
     /reference/constraints/Expression

components/http_foundation.rst

@@ -611,7 +611,6 @@ Learn More
     /components/http_foundation/*
     /controller
     /controller/*
-    /request/*
     /session/*
     /http_cache/*
 

components/http_foundation/trusting_proxies.rst

@@ -7,7 +7,7 @@ Trusting Proxies
 .. tip::
 
     If you're using the Symfony Framework, start by reading
-    :doc:`/request/load_balancer_reverse_proxy`.
+    :doc:`/deployment/proxies`.
 
 If you find yourself behind some sort of proxy - like a load balancer - then
 certain header information may be sent to you using special ``X-Forwarded-*``

request/psr7.rst → components/psr7.rst

@@ -13,7 +13,7 @@ Installation
 
 You can install the component in 2 different ways:
 
-* :doc:`Install it via Composer </components/using_components>` (`symfony/psr-http-message-bridge on Packagist <https://packagist.org/packages/symfony/psr-http-message-bridge>`_);
+* :doc:`Install it via Composer </components/using_components>` (`symfony/psr-http-message-bridge on Packagist`_);
 * Use the official Git repository (https://github.com/symfony/psr-http-message-bridge).
 
 The bridge also needs a PSR-7 implementation to allow converting HttpFoundation
@@ -87,3 +87,4 @@ to a :class:`Symfony\\Component\\HttpFoundation\\Response` instance::
 
 .. _`PSR-7`: http://www.php-fig.org/psr/psr-7/
 .. _`Zend Diactoros`: https://github.com/zendframework/zend-diactoros
+.. _`symfony/psr-http-message-bridge on Packagist`: https://packagist.org/packages/symfony/psr-http-message-bridge

frontend.rst

@@ -2,5 +2,11 @@ Front-end
 =========
 
 See the latest version of the docs for frontend tools. Or, see
-:doc:`/assetic`.
+:doc:`/frontend/assetic`.
 
+.. toctree::
+    :maxdepth: 1
+    :glob:
+    :hidden:
+
+    frontend/*

assetic/asset_management.rst → frontend/assetic/asset_management.rst

@@ -181,7 +181,7 @@ To include an image you can use the ``image`` tag.
         <?php endforeach ?>
 
 You can also use Assetic for image optimization. More information in
-:doc:`/assetic/jpeg_optimize`.
+:doc:`/frontend/assetic/jpeg_optimize`.
 
 .. tip::
 
@@ -441,7 +441,7 @@ into your template:
         <?php endforeach ?>
 
 A more detailed guide about configuring and using Assetic filters as well as
-details of Assetic's debug mode can be found in :doc:`/assetic/uglifyjs`.
+details of Assetic's debug mode can be found in :doc:`/frontend/assetic/uglifyjs`.
 
 Controlling the URL Used
 ------------------------

assetic/yuicompressor.rst → frontend/assetic/yuicompressor.rst

@@ -8,7 +8,7 @@ How to Minify JavaScripts and Stylesheets with YUI Compressor
 
     The YUI Compressor is `no longer maintained by Yahoo`_. That's why you are
     **strongly advised to avoid using YUI utilities** unless strictly necessary.
-    Read :doc:`/assetic/uglifyjs` for a modern and up-to-date alternative.
+    Read :doc:`/frontend/assetic/uglifyjs` for a modern and up-to-date alternative.
 
 Yahoo! provides an excellent utility for minifying JavaScripts and stylesheets
 so they travel over the wire faster, the `YUI Compressor`_. Thanks to Assetic,

index.rst

@@ -37,22 +37,19 @@ Topics
 .. toctree::
     :maxdepth: 1
 
-    assetic
     bundles
     console
     doctrine
     debug
     deployment
     email
     event_dispatcher
-    expressions
     forms
     frontend
     http_cache
     logging
     performance
     profiler
-    request
     routing
     security
     session

quick_tour/the_view.rst

@@ -262,7 +262,7 @@ Symfony provides the ``asset()`` function to deal with them easily:
 
 The ``asset()`` function looks for the web assets inside the ``web/`` directory.
 If you store them in another directory, read
-:doc:`this article </assetic/asset_management>`
+:doc:`this article </frontend/assetic/asset_management>`
 to learn how to manage web assets.
 
 Using the ``asset()`` function, your application is more portable. The reason

reference/configuration/framework.rst

@@ -50,6 +50,8 @@ Configuration
         * `ip`_
         * :ref:`path <reference-profiler-matcher-path>`
         * `service`_
+* `request`_:
+    * `formats`_
 * `router`_
     * `resource`_
     * `type`_
@@ -178,7 +180,7 @@ trusted_proxies
 **type**: ``array``
 
 Configures the IP addresses that should be trusted as proxies. For more
-details, see :doc:`/request/load_balancer_reverse_proxy`.
+details, see :doc:`/deployment/proxies`.
 
 .. versionadded:: 2.3
     CIDR notation support was introduced in Symfony 2.3, so you can whitelist
@@ -647,6 +649,69 @@ service
 
 This setting contains the service id of a custom matcher.
 
+request
+~~~~~~~
+
+formats
+.......
+
+**type**: ``array`` **default**: ``[]``
+
+This setting is used to associate additional request formats (e.g. ``html``)
+to one or more mime types (e.g. ``text/html``), which will allow you to use the
+format & mime types to call
+:method:`Request::getFormat($mimeType) <Symfony\\Component\\HttpFoundation\\Request::getFormat>` or
+:method:`Request::getMimeType($format) <Symfony\\Component\\HttpFoundation\\Request::getMimeType>`.
+
+In practice, this is important because Symfony uses it to automatically set the
+``Content-Type`` header on the ``Response`` (if you don't explicitly set one).
+If you pass an array of mime types, the first will be used for the header.
+
+To configure a ``jsonp`` format:
+
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        # app/config/config.yml
+        framework:
+            request:
+                formats:
+                    jsonp: 'application/javascript'
+
+    .. code-block:: xml
+
+        <!-- app/config/config.xml -->
+        <?xml version="1.0" encoding="UTF-8" ?>
+
+        <container xmlns="http://symfony.com/schema/dic/services"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xmlns:framework="http://symfony.com/schema/dic/symfony"
+            xsi:schemaLocation="http://symfony.com/schema/dic/services
+                http://symfony.com/schema/dic/services/services-1.0.xsd
+                http://symfony.com/schema/dic/symfony
+                http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+            <framework:config>
+                <framework:request>
+                    <framework:format name="jsonp">
+                        <framework:mime-type>application/javascript</framework:mime-type>
+                    </framework:format>
+                </framework:request>
+            </framework:config>
+        </container>
+
+    .. code-block:: php
+
+        // app/config/config.php
+        $container->loadFromExtension('framework', array(
+            'request' => array(
+                'formats' => array(
+                    'jsonp' => 'application/javascript',
+                ),
+            ),
+        ));
+
 router
 ~~~~~~
 

reference/dic_tags.rst

@@ -193,7 +193,7 @@ Finally, apply the filter:
     {% endjavascripts %}
 
 You can also apply your filter via the ``assetic.filters.my_filter.apply_to``
-config option as it's described here: :doc:`/assetic/apply_to_option`.
+config option as it's described here: :doc:`/frontend/assetic/apply_to_option`.
 In order to do that, you must define your filter service in a separate xml
 config file and point to this file's path via the ``assetic.filters.my_filter.resource``
 configuration key.

reference/twig_reference.rst

@@ -781,7 +781,7 @@ Those bundles can have other Twig extensions:
 
 * **Assetic** adds the ``{% stylesheets %}``, ``{% javascripts %}`` and
   ``{% image %}`` tags. You can read more about them in
-  :doc:`the Assetic Documentation </assetic/asset_management>`.
+  :doc:`the Assetic Documentation </frontend/assetic/asset_management>`.
 
 .. _`Twig Reference`: http://twig.sensiolabs.org/documentation#reference
 .. _`Twig Extensions repository`: https://github.com/twigphp/Twig-extensions