symfony · fancyweb · Jul 20, 2016 · Jul 20, 2016 · Jul 20, 2016 · Jul 20, 2016
diff --git a/CONTRIBUTING.md → .github/CONTRIBUTING.md b/CONTRIBUTING.md → .github/CONTRIBUTING.md
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
-/_build
+/_build/doctrees
+/_build/html
 *.pyc
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,14 @@
 language: python

-python: "2.7"
+python: 2.7

 sudo: false
-
 cache:
-    directories:
-        - $HOME/.cache/pip
-        - _build
+  directories: [$HOME/.cache/pip]

 install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git

-script: sphinx-build -nW -b html -d _build/doctrees . _build/html
+script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html

 branches:
  except:

diff --git a/Makefile → _build/Makefile b/Makefile → _build/Makefile
diff --git a/_theme/_exts/symfonycom/__init__.py → _build/_theme/_exts/symfonycom/__init__.py b/_theme/_exts/symfonycom/__init__.py → _build/_theme/_exts/symfonycom/__init__.py
diff --git a/_theme/_exts/symfonycom/sphinx/__init__.py → ...theme/_exts/symfonycom/sphinx/__init__.py b/_theme/_exts/symfonycom/sphinx/__init__.py → ...theme/_exts/symfonycom/sphinx/__init__.py
diff --git a/_theme/_templates/globaltoc.html → _build/_theme/_templates/globaltoc.html b/_theme/_templates/globaltoc.html → _build/_theme/_templates/globaltoc.html
@@ -1,7 +1,6 @@
 <div class=submenu>
    {% set menu = [ 
-        ('The Book', 'book/index'),
-        ('The Cookbook', 'cookbook/index'),
+        ('Home', 'index'),
        ('The Components', 'components/index'),
        ('The Best Practices', 'best_practices/index'),
        ('The Quick Tour', 'quick_tour/index'),

diff --git a/_theme/_templates/layout.html → _build/_theme/_templates/layout.html b/_theme/_templates/layout.html → _build/_theme/_templates/layout.html
diff --git a/_theme/_templates/localtoc.html → _build/_theme/_templates/localtoc.html b/_theme/_templates/localtoc.html → _build/_theme/_templates/localtoc.html
diff --git a/conf.py → _build/conf.py b/conf.py → _build/conf.py
@@ -75,7 +75,7 @@

 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_theme']
+exclude_patterns = ['_build']

 # The reST default role (used for this markup: `text`) to use for all documents.
 #default_role = None
@@ -279,4 +279,3 @@

 # Use PHP syntax highlighting in code examples by default
 highlight_language='php'
-
diff --git a/make.bat → _build/make.bat b/make.bat → _build/make.bat
diff --git a/_build/redirection_map b/_build/redirection_map
diff --git a/...es/components/console/debug_formatter.png → ...es/components/console/debug_formatter.png b/...es/components/console/debug_formatter.png → ...es/components/console/debug_formatter.png
diff --git a/...mponents/console/process-helper-debug.png → ...mponents/console/process-helper-debug.png b/...mponents/console/process-helper-debug.png → ...mponents/console/process-helper-debug.png
diff --git a/...ts/console/process-helper-error-debug.png → ...ts/console/process-helper-error-debug.png b/...ts/console/process-helper-error-debug.png → ...ts/console/process-helper-error-debug.png
diff --git a/...onents/console/process-helper-verbose.png → ...onents/console/process-helper-verbose.png b/...onents/console/process-helper-verbose.png → ...onents/console/process-helper-verbose.png
diff --git a/images/components/console/progress.png → _images/components/console/progress.png b/images/components/console/progress.png → _images/components/console/progress.png
diff --git a/images/components/console/progressbar.gif → _images/components/console/progressbar.gif b/images/components/console/progressbar.gif → _images/components/console/progressbar.gif
diff --git a/images/components/console/table.png → _images/components/console/table.png b/images/components/console/table.png → _images/components/console/table.png
diff --git a/images/components/form/general_flow.png → _images/components/form/general_flow.png b/images/components/form/general_flow.png → _images/components/form/general_flow.png
diff --git a/images/components/form/set_data_flow.png → _images/components/form/set_data_flow.png b/images/components/form/set_data_flow.png → _images/components/form/set_data_flow.png
diff --git a/images/components/form/submission_flow.png → _images/components/form/submission_flow.png b/images/components/form/submission_flow.png → _images/components/form/submission_flow.png
diff --git a/...es/components/http_kernel/01-workflow.png → ...es/components/http_kernel/01-workflow.png b/...es/components/http_kernel/01-workflow.png → ...es/components/http_kernel/01-workflow.png
diff --git a/...ponents/http_kernel/02-kernel-request.png → ...ponents/http_kernel/02-kernel-request.png b/...ponents/http_kernel/02-kernel-request.png → ...ponents/http_kernel/02-kernel-request.png
diff --git a/...ttp_kernel/03-kernel-request-response.png → ...ttp_kernel/03-kernel-request-response.png b/...ttp_kernel/03-kernel-request-response.png → ...ttp_kernel/03-kernel-request-response.png
diff --git a/...nts/http_kernel/04-resolve-controller.png → ...nts/http_kernel/04-resolve-controller.png b/...nts/http_kernel/04-resolve-controller.png → ...nts/http_kernel/04-resolve-controller.png
diff --git a/...ents/http_kernel/06-kernel-controller.png → ...ents/http_kernel/06-kernel-controller.png b/...ents/http_kernel/06-kernel-controller.png → ...ents/http_kernel/06-kernel-controller.png
diff --git a/...s/http_kernel/07-controller-arguments.png → ...s/http_kernel/07-controller-arguments.png b/...s/http_kernel/07-controller-arguments.png → ...s/http_kernel/07-controller-arguments.png
diff --git a/...onents/http_kernel/08-call-controller.png → ...onents/http_kernel/08-call-controller.png b/...onents/http_kernel/08-call-controller.png → ...onents/http_kernel/08-call-controller.png
diff --git a/...kernel/09-controller-returns-response.png → ...kernel/09-controller-returns-response.png b/...kernel/09-controller-returns-response.png → ...kernel/09-controller-returns-response.png
diff --git a/...components/http_kernel/10-kernel-view.png → ...components/http_kernel/10-kernel-view.png b/...components/http_kernel/10-kernel-view.png → ...components/http_kernel/10-kernel-view.png
diff --git a/...nents/http_kernel/11-kernel-exception.png → ...nents/http_kernel/11-kernel-exception.png b/...nents/http_kernel/11-kernel-exception.png → ...nents/http_kernel/11-kernel-exception.png
diff --git a/...nts/http_kernel/request-response-flow.png → ...nts/http_kernel/request-response-flow.png b/...nts/http_kernel/request-response-flow.png → ...nts/http_kernel/request-response-flow.png
diff --git a/...es/components/http_kernel/sub-request.png → ...es/components/http_kernel/sub-request.png b/...es/components/http_kernel/sub-request.png → ...es/components/http_kernel/sub-request.png
diff --git a/images/components/phpunit_bridge/report.png → _images/components/phpunit_bridge/report.png b/images/components/phpunit_bridge/report.png → _images/components/phpunit_bridge/report.png
diff --git a/...onents/serializer/serializer_workflow.png → ...onents/serializer/serializer_workflow.png b/...onents/serializer/serializer_workflow.png → ...onents/serializer/serializer_workflow.png
diff --git a/images/components/var_dumper/01-simple.png → _images/components/var_dumper/01-simple.png b/images/components/var_dumper/01-simple.png → _images/components/var_dumper/01-simple.png
diff --git a/...mponents/var_dumper/02-multi-line-str.png → ...mponents/var_dumper/02-multi-line-str.png b/...mponents/var_dumper/02-multi-line-str.png → ...mponents/var_dumper/02-multi-line-str.png
diff --git a/images/components/var_dumper/03-object.png → _images/components/var_dumper/03-object.png b/images/components/var_dumper/03-object.png → _images/components/var_dumper/03-object.png
diff --git a/...onents/var_dumper/04-dynamic-property.png → ...onents/var_dumper/04-dynamic-property.png b/...onents/var_dumper/04-dynamic-property.png → ...onents/var_dumper/04-dynamic-property.png
diff --git a/images/components/var_dumper/05-soft-ref.png → ...ges/components/var_dumper/05-soft-ref.png b/images/components/var_dumper/05-soft-ref.png → ...ges/components/var_dumper/05-soft-ref.png
diff --git a/...es/components/var_dumper/06-constants.png → ...es/components/var_dumper/06-constants.png b/...es/components/var_dumper/06-constants.png → ...es/components/var_dumper/06-constants.png
diff --git a/images/components/var_dumper/07-hard-ref.png → ...ges/components/var_dumper/07-hard-ref.png b/images/components/var_dumper/07-hard-ref.png → ...ges/components/var_dumper/07-hard-ref.png
diff --git a/...onents/var_dumper/08-virtual-property.png → ...onents/var_dumper/08-virtual-property.png b/...onents/var_dumper/08-virtual-property.png → ...onents/var_dumper/08-virtual-property.png
diff --git a/images/components/var_dumper/09-cut.png → _images/components/var_dumper/09-cut.png b/images/components/var_dumper/09-cut.png → _images/components/var_dumper/09-cut.png
diff --git a/...es/contributing/docs-github-create-pr.png → ...es/contributing/docs-github-create-pr.png b/...es/contributing/docs-github-create-pr.png → ...es/contributing/docs-github-create-pr.png
diff --git a/...es/contributing/docs-github-edit-page.png → ...es/contributing/docs-github-edit-page.png b/...es/contributing/docs-github-edit-page.png → ...es/contributing/docs-github-edit-page.png
diff --git a/...ibuting/docs-pull-request-change-base.png → ...ibuting/docs-pull-request-change-base.png b/...ibuting/docs-pull-request-change-base.png → ...ibuting/docs-pull-request-change-base.png
diff --git a/...ributing/docs-pull-request-platformsh.png → ...ributing/docs-pull-request-platformsh.png b/...ributing/docs-pull-request-platformsh.png → ...ributing/docs-pull-request-platformsh.png
diff --git a/images/contributing/release-process.jpg → _images/contributing/release-process.jpg b/images/contributing/release-process.jpg → _images/contributing/release-process.jpg
diff --git a/...rror_pages/errors-in-prod-environment.png → ...rror_pages/errors-in-prod-environment.png b/...rror_pages/errors-in-prod-environment.png → ...rror_pages/errors-in-prod-environment.png
diff --git a/...r_pages/exceptions-in-dev-environment.png → ...r_pages/exceptions-in-dev-environment.png b/...r_pages/exceptions-in-dev-environment.png → ...r_pages/exceptions-in-dev-environment.png
diff --git a/...book/deployment/azure-website/step-01.png → _images/deployment/azure-website/step-01.png b/...book/deployment/azure-website/step-01.png → _images/deployment/azure-website/step-01.png
diff --git a/...book/deployment/azure-website/step-02.png → _images/deployment/azure-website/step-02.png b/...book/deployment/azure-website/step-02.png → _images/deployment/azure-website/step-02.png
diff --git a/...book/deployment/azure-website/step-03.png → _images/deployment/azure-website/step-03.png b/...book/deployment/azure-website/step-03.png → _images/deployment/azure-website/step-03.png
diff --git a/...book/deployment/azure-website/step-04.png → _images/deployment/azure-website/step-04.png b/...book/deployment/azure-website/step-04.png → _images/deployment/azure-website/step-04.png
diff --git a/...book/deployment/azure-website/step-05.png → _images/deployment/azure-website/step-05.png b/...book/deployment/azure-website/step-05.png → _images/deployment/azure-website/step-05.png
diff --git a/...book/deployment/azure-website/step-06.png → _images/deployment/azure-website/step-06.png b/...book/deployment/azure-website/step-06.png → _images/deployment/azure-website/step-06.png
diff --git a/...book/deployment/azure-website/step-07.png → _images/deployment/azure-website/step-07.png b/...book/deployment/azure-website/step-07.png → _images/deployment/azure-website/step-07.png
diff --git a/...book/deployment/azure-website/step-08.png → _images/deployment/azure-website/step-08.png b/...book/deployment/azure-website/step-08.png → _images/deployment/azure-website/step-08.png
diff --git a/...book/deployment/azure-website/step-09.png → _images/deployment/azure-website/step-09.png b/...book/deployment/azure-website/step-09.png → _images/deployment/azure-website/step-09.png
diff --git a/...book/deployment/azure-website/step-10.png → _images/deployment/azure-website/step-10.png b/...book/deployment/azure-website/step-10.png → _images/deployment/azure-website/step-10.png
diff --git a/...book/deployment/azure-website/step-11.png → _images/deployment/azure-website/step-11.png b/...book/deployment/azure-website/step-11.png → _images/deployment/azure-website/step-11.png
diff --git a/...book/deployment/azure-website/step-12.png → _images/deployment/azure-website/step-12.png b/...book/deployment/azure-website/step-12.png → _images/deployment/azure-website/step-12.png
diff --git a/...book/deployment/azure-website/step-13.png → _images/deployment/azure-website/step-13.png b/...book/deployment/azure-website/step-13.png → _images/deployment/azure-website/step-13.png
diff --git a/...book/deployment/azure-website/step-14.png → _images/deployment/azure-website/step-14.png b/...book/deployment/azure-website/step-14.png → _images/deployment/azure-website/step-14.png
diff --git a/...book/deployment/azure-website/step-15.png → _images/deployment/azure-website/step-15.png b/...book/deployment/azure-website/step-15.png → _images/deployment/azure-website/step-15.png
diff --git a/...book/deployment/azure-website/step-16.png → _images/deployment/azure-website/step-16.png b/...book/deployment/azure-website/step-16.png → _images/deployment/azure-website/step-16.png
diff --git a/...book/deployment/azure-website/step-17.png → _images/deployment/azure-website/step-17.png b/...book/deployment/azure-website/step-17.png → _images/deployment/azure-website/step-17.png
diff --git a/...book/deployment/azure-website/step-18.png → _images/deployment/azure-website/step-18.png b/...book/deployment/azure-website/step-18.png → _images/deployment/azure-website/step-18.png
diff --git a/images/docs-pull-request-change-base.png → _images/docs-pull-request-change-base.png b/images/docs-pull-request-change-base.png → _images/docs-pull-request-change-base.png
diff --git a/images/book/doctrine_image_2.png → _images/doctrine/mapping_relations.png b/images/book/doctrine_image_2.png → _images/doctrine/mapping_relations.png
diff --git a/images/book/doctrine_image_3.png → _images/doctrine/mapping_relations_proxy.png b/images/book/doctrine_image_3.png → _images/doctrine/mapping_relations_proxy.png
diff --git a/images/book/doctrine_image_1.png → _images/doctrine/mapping_single_entity.png b/images/book/doctrine_image_1.png → _images/doctrine/mapping_single_entity.png
diff --git a/images/book/doctrine_web_debug_toolbar.png → _images/doctrine/web_debug_toolbar.png b/images/book/doctrine_web_debug_toolbar.png → _images/doctrine/web_debug_toolbar.png
diff --git a/...s/cookbook/form/DataTransformersTypes.png → _images/form/data-transformer-types.png b/...s/cookbook/form/DataTransformersTypes.png → _images/form/data-transformer-types.png
diff --git a/images/book/form-simple2.png → _images/form/simple-form-2.png b/images/book/form-simple2.png → _images/form/simple-form-2.png
diff --git a/images/book/form-simple.png → _images/form/simple-form.png b/images/book/form-simple.png → _images/form/simple-form.png
diff --git a/images/request-flow.png → _images/http/request-flow.png b/images/request-flow.png → _images/http/request-flow.png
diff --git a/images/http-xkcd.png → _images/http/xkcd-full.png b/images/http-xkcd.png → _images/http/xkcd-full.png
diff --git a/images/http-xkcd-request.png → _images/http/xkcd-request.png b/images/http-xkcd-request.png → _images/http/xkcd-request.png
diff --git a/images/cookbook/deprecations-in-profiler.png → _images/install/deprecations-in-profiler.png b/images/cookbook/deprecations-in-profiler.png → _images/install/deprecations-in-profiler.png
diff --git a/images/quick_tour/profiler.png → _images/quick_tour/profiler.png b/images/quick_tour/profiler.png → _images/quick_tour/profiler.png
diff --git a/images/quick_tour/web_debug_toolbar.png → _images/quick_tour/web_debug_toolbar.png b/images/quick_tour/web_debug_toolbar.png → _images/quick_tour/web_debug_toolbar.png
diff --git a/images/quick_tour/welcome.png → _images/quick_tour/welcome.png b/images/quick_tour/welcome.png → _images/quick_tour/welcome.png
diff --git a/images/reference/form/choice-example1.png → _images/reference/form/choice-example1.png b/images/reference/form/choice-example1.png → _images/reference/form/choice-example1.png
diff --git a/images/reference/form/choice-example2.png → _images/reference/form/choice-example2.png b/images/reference/form/choice-example2.png → _images/reference/form/choice-example2.png
diff --git a/images/reference/form/choice-example3.png → _images/reference/form/choice-example3.png b/images/reference/form/choice-example3.png → _images/reference/form/choice-example3.png
diff --git a/images/reference/form/choice-example4.png → _images/reference/form/choice-example4.png b/images/reference/form/choice-example4.png → _images/reference/form/choice-example4.png
diff --git a/images/reference/form/choice-example5.png → _images/reference/form/choice-example5.png b/images/reference/form/choice-example5.png → _images/reference/form/choice-example5.png
diff --git a/images/release-process.jpg → _images/release-process.jpg b/images/release-process.jpg → _images/release-process.jpg
diff --git a/images/book/security_anonymous_wdt.png → _images/security/anonymous_wdt.png b/images/book/security_anonymous_wdt.png → _images/security/anonymous_wdt.png
diff --git a/images/book/security_http_basic_popup.png → _images/security/http_basic_popup.png b/images/book/security_http_basic_popup.png → _images/security/http_basic_popup.png
diff --git a/images/book/symfony_loggedin_wdt.png → _images/security/symfony_loggedin_wdt.png b/images/book/symfony_loggedin_wdt.png → _images/security/symfony_loggedin_wdt.png
diff --git a/images/book/translation/debug_1.png → _images/translation/debug_1.png b/images/book/translation/debug_1.png → _images/translation/debug_1.png
diff --git a/images/book/translation/debug_2.png → _images/translation/debug_2.png b/images/book/translation/debug_2.png → _images/translation/debug_2.png
diff --git a/images/book/translation/debug_3.png → _images/translation/debug_3.png b/images/book/translation/debug_3.png → _images/translation/debug_3.png
diff --git a/images/book/translation/debug_4.png → _images/translation/debug_4.png b/images/book/translation/debug_4.png → _images/translation/debug_4.png
diff --git a/_includes/_rewrite_rule_tip.rst.inc b/_includes/_rewrite_rule_tip.rst.inc
@@ -0,0 +1,6 @@
+.. tip::
+
+    By using rewrite rules in your
+    :doc:`web server configuration </setup/web_server_configuration>`,
+    the ``index.php`` won't be needed and you will have beautiful, clean URLs
+    (e.g. ``/show``).
diff --git a/...udes/_service_container_my_mailer.rst.inc → ...udes/service_container/_my_mailer.rst.inc b/...udes/_service_container_my_mailer.rst.inc → ...udes/service_container/_my_mailer.rst.inc
diff --git a/assetic.rst b/assetic.rst
@@ -0,0 +1,10 @@
+Assetic
+=======
+
+.. include:: /assetic/_standard_edition_warning.rst.inc
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    assetic/*
diff --git a/...ook/assetic/_standard_edition_warning.inc → assetic/_standard_edition_warning.rst.inc b/...ook/assetic/_standard_edition_warning.inc → assetic/_standard_edition_warning.rst.inc
@@ -1,5 +1,5 @@
 .. caution::

    Starting from Symfony 2.8, Assetic is no longer included by default in the
-    Symfony Standard Edition. Refer to :doc:`this article </cookbook/assetic/asset_management>`
+    Symfony Standard Edition. Refer to :doc:`this article </assetic/asset_management>`
    to learn how to install and enable Assetic in your Symfony application.
diff --git a/cookbook/assetic/apply_to_option.rst → assetic/apply_to_option.rst b/cookbook/assetic/apply_to_option.rst → assetic/apply_to_option.rst
@@ -4,7 +4,7 @@
 How to Apply an Assetic Filter to a specific File Extension
 ===========================================================

-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc

 Assetic filters can be applied to individual files, groups of files or even,
 as you'll see here, files that have a specific extension. To show you how
@@ -116,7 +116,7 @@ You can also combine multiple CoffeeScript files into a single output file:

 Both files will now be served up as a single file compiled into regular JavaScript.

-.. _cookbook-assetic-apply-to:
+.. _assetic-apply-to:

 Filtering Based on a File Extension
 -----------------------------------

diff --git a/cookbook/assetic/asset_management.rst → assetic/asset_management.rst b/cookbook/assetic/asset_management.rst → assetic/asset_management.rst
@@ -87,8 +87,8 @@ your application:
 Introducing Assetic
 -------------------

-Assetic combines two major ideas: :ref:`assets <cookbook-assetic-assets>` and
-:ref:`filters <cookbook-assetic-filters>`. The assets are files such as CSS,
+Assetic combines two major ideas: :ref:`assets <assetic-assets>` and
+:ref:`filters <assetic-filters>`. The assets are files such as CSS,
 JavaScript and image files. The filters are things that can be applied to
 these files before they are served to the browser. This allows a separation
 between the asset files stored in the application and the files actually presented
@@ -117,7 +117,7 @@ load them from anywhere) before serving them. This means you can:

 * Run image optimizations on your images

-.. _cookbook-assetic-assets:
+.. _assetic-assets:

 Assets
 ------
@@ -126,12 +126,12 @@ Using Assetic provides many advantages over directly serving the files.
 The files do not need to be stored where they are served from and can be
 drawn from various sources such as from within a bundle.

-You can use Assetic to process :ref:`CSS stylesheets <cookbook-assetic-including-css>`,
-:ref:`JavaScript files <cookbook-assetic-including-javascript>` and
-:ref:`images <cookbook-assetic-including-image>`. The philosophy
+You can use Assetic to process :ref:`CSS stylesheets <assetic-including-css>`,
+:ref:`JavaScript files <assetic-including-javascript>` and
+:ref:`images <assetic-including-image>`. The philosophy
 behind adding either is basically the same, but with a slightly different syntax.

-.. _cookbook-assetic-including-javascript:
+.. _assetic-including-javascript:

 Including JavaScript Files
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -172,7 +172,7 @@ To include JavaScript files, use the ``javascripts`` tag in any template:

 .. tip::

-    You can also include CSS stylesheets: see :ref:`cookbook-assetic-including-css`.
+    You can also include CSS stylesheets: see :ref:`assetic-including-css`.

 In this example, all files in the ``Resources/public/js/`` directory of the
 AppBundle will be loaded and served from a different location. The actual
@@ -184,9 +184,9 @@ rendered tag might simply look like:

 This is a key point: once you let Assetic handle your assets, the files are
 served from a different location. This *will* cause problems with CSS files
-that reference images by their relative path. See :ref:`cookbook-assetic-cssrewrite`.
+that reference images by their relative path. See :ref:`assetic-cssrewrite`.

-.. _cookbook-assetic-including-css:
+.. _assetic-including-css:

 Including CSS Stylesheets
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -229,7 +229,7 @@ except with the ``stylesheets`` tag:

 But because Assetic changes the paths to your assets, this *will* break any
 background images (or other paths) that uses relative paths, unless you use
-the :ref:`cssrewrite <cookbook-assetic-cssrewrite>` filter.
+the :ref:`cssrewrite <assetic-cssrewrite>` filter.

 .. note::

@@ -240,7 +240,7 @@ the :ref:`cssrewrite <cookbook-assetic-cssrewrite>` filter.
    that there is a known issue that causes the ``cssrewrite`` filter to fail
    when using the ``@AppBundle`` syntax for CSS stylesheets.

-.. _cookbook-assetic-including-image:
+.. _assetic-including-image:

 Including Images
 ~~~~~~~~~~~~~~~~
@@ -264,15 +264,15 @@ To include an image you can use the ``image`` tag.
        <?php endforeach ?>

 You can also use Assetic for image optimization. More information in
-:doc:`/cookbook/assetic/jpeg_optimize`.
+:doc:`/assetic/jpeg_optimize`.

 .. tip::

    Instead of using Assetic to include images, you may consider using the
    `LiipImagineBundle`_ community bundle, which allows to compress and
    manipulate images (rotate, resize, watermark, etc.) before serving them.

-.. _cookbook-assetic-cssrewrite:
+.. _assetic-cssrewrite:

 Fixing CSS Paths with the ``cssrewrite`` Filter
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -333,7 +333,7 @@ the JavaScript files.
    If you're new to Assetic and try to use your application in the ``prod``
    environment (by using the ``app.php`` controller), you'll likely see
    that all of your CSS and JS breaks. Don't worry! This is on purpose.
-    For details on using Assetic in the ``prod`` environment, see :ref:`cookbook-assetic-dumping`.
+    For details on using Assetic in the ``prod`` environment, see :ref:`assetic-dumping`.

 And combining files doesn't only apply to *your* files. You can also use Assetic to
 combine third party assets, such as jQuery, with your own into a single file:
@@ -437,7 +437,7 @@ with the ``@named_asset`` notation:
            <script src="<?php echo $view->escape($url) ?>"></script>
        <?php endforeach ?>

-.. _cookbook-assetic-filters:
+.. _assetic-filters:

 Filters
 -------
@@ -524,7 +524,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:`/cookbook/assetic/uglifyjs`.
+details of Assetic's debug mode can be found in :doc:`/assetic/uglifyjs`.

 Controlling the URL Used
 ------------------------
@@ -557,7 +557,7 @@ done from the template and is relative to the public document root:
    via configuration on each deployment. For more information, see the
    :ref:`reference-framework-assets-version` configuration option.

-.. _cookbook-assetic-dumping:
+.. _assetic-dumping:

 Dumping Asset Files
 -------------------
@@ -591,7 +591,7 @@ by Symfony (as the asset files are in the ``dev`` environment). This is on
 purpose - letting Symfony generate these files dynamically in a production
 environment is just too slow.

-.. _cookbook-assetic-dump-prod:
+.. _assetic-dump-prod:

 Instead, each time you use your application in the ``prod`` environment (and therefore,
 each time you deploy), you should run the following command:

diff --git a/cookbook/assetic/jpeg_optimize.rst → assetic/jpeg_optimize.rst b/cookbook/assetic/jpeg_optimize.rst → assetic/jpeg_optimize.rst
@@ -4,7 +4,7 @@
 How to Use Assetic for Image Optimization with Twig Functions
 =============================================================

-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc

 Among its many filters, Assetic has four filters which can be used for on-the-fly
 image optimization. This allows you to get the benefits of smaller file sizes

diff --git a/cookbook/assetic/php.rst → assetic/php.rst b/cookbook/assetic/php.rst → assetic/php.rst
@@ -4,7 +4,7 @@
 Combining, Compiling and Minimizing Web Assets with PHP Libraries
 =================================================================

-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc

 The official Symfony Best Practices recommend to use Assetic to
 :doc:`manage web assets </best_practices/web-assets>`, unless you are

diff --git a/cookbook/assetic/uglifyjs.rst → assetic/uglifyjs.rst b/cookbook/assetic/uglifyjs.rst → assetic/uglifyjs.rst
@@ -4,14 +4,14 @@
 How to Minify CSS/JS Files (Using UglifyJS and UglifyCSS)
 =========================================================

-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc

 `UglifyJS`_ is a JavaScript parser/compressor/beautifier toolkit. It can be used
 to combine and minify JavaScript assets so that they require less HTTP requests
 and make your site load faster. `UglifyCSS`_ is a CSS compressor/beautifier
 that is very similar to UglifyJS.

-In this cookbook, the installation, configuration and usage of UglifyJS is
+In this article, the installation, configuration and usage of UglifyJS is
 shown in detail. UglifyCSS works pretty much the same way and is only
 talked about briefly.

@@ -236,14 +236,14 @@ apply this filter when debug mode is off (e.g. ``app.php``):
        <?php endforeach ?>

 To try this out, switch to your ``prod`` environment (``app.php``). But before
-you do, don't forget to :ref:`clear your cache <book-page-creation-prod-cache-clear>`
-and :ref:`dump your assetic assets <cookbook-assetic-dump-prod>`.
+you do, don't forget to :ref:`clear your cache <page-creation-prod-cache-clear>`
+and :ref:`dump your assetic assets <assetic-dump-prod>`.

 .. tip::

    Instead of adding the filters to the asset tags, you can also configure which
    filters to apply for each file in your application configuration file.
-    See :ref:`cookbook-assetic-apply-to` for more details.
+    See :ref:`assetic-apply-to` for more details.

 Install, Configure and Use UglifyCSS
 ------------------------------------

diff --git a/cookbook/assetic/yuicompressor.rst → assetic/yuicompressor.rst b/cookbook/assetic/yuicompressor.rst → assetic/yuicompressor.rst
@@ -8,9 +8,9 @@ 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:`/cookbook/assetic/uglifyjs` for a modern and up-to-date alternative.
+    Read :doc:`/assetic/uglifyjs` for a modern and up-to-date alternative.

-.. include:: /cookbook/assetic/_standard_edition_warning.inc
+.. include:: /assetic/_standard_edition_warning.rst.inc

 Yahoo! provides an excellent utility for minifying JavaScripts and stylesheets
 so they travel over the wire faster, the `YUI Compressor`_. Thanks to Assetic,
@@ -173,7 +173,7 @@ apply this filter when debug mode is off.
    example in the ``yui_js`` filter ``apply_to: "\.js$"``. To only have the filter
    applied in production, add this to the ``config_prod`` file rather than the
    common config file. For details on applying filters by file extension,
-    see :ref:`cookbook-assetic-apply-to`.
+    see :ref:`assetic-apply-to`.

 .. _`YUI Compressor`: http://yui.github.io/yuicompressor/
 .. _`Download the JAR`: https://github.com/yui/yuicompressor/releases

diff --git a/best_practices/configuration.rst b/best_practices/configuration.rst
@@ -78,7 +78,7 @@ add an extra layer of configuration that's not needed because you don't need
 or want these configuration values to change on each server.

 The configuration options defined in the ``config.yml`` file usually vary from
-one :doc:`environment </cookbook/configuration/environments>` to another. That's
+one :doc:`environment </configuration/environments>` to another. That's
 why Symfony already includes ``app/config/config_dev.yml`` and ``app/config/config_prod.yml``
 files so that you can override specific values for each environment.

@@ -160,7 +160,7 @@ Semantic Configuration: Don't Do It

    Don't define a semantic dependency injection configuration for your bundles.

-As explained in :doc:`/cookbook/bundles/extension` article, Symfony bundles
+As explained in :doc:`/bundles/extension` article, Symfony bundles
 have two choices on how to handle configuration: normal service configuration
 through the ``services.yml`` file and semantic configuration through a special
 ``*Extension`` class.
@@ -176,7 +176,7 @@ Moving Sensitive Options Outside of Symfony Entirely
 When dealing with sensitive options, like database credentials, we also recommend
 that you store them outside the Symfony project and make them available
 through environment variables. Learn how to do it in the following article:
-:doc:`/cookbook/configuration/external_parameters`
+:doc:`/configuration/external_parameters`.

 .. _`feature toggles`: https://en.wikipedia.org/wiki/Feature_toggle
 .. _`constant() function`: http://twig.sensiolabs.org/doc/functions/constant.html
diff --git a/best_practices/controllers.rst b/best_practices/controllers.rst
@@ -208,6 +208,6 @@ Pre and Post Hooks

 If you need to execute some code before or after the execution of your controllers,
 you can use the EventDispatcher component to
-:doc:`set up before and after filters </cookbook/event_dispatcher/before_after_filters>`.
+:doc:`set up before and after filters </event_dispatcher/before_after_filters>`.

 .. _`ParamConverter`: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
diff --git a/best_practices/creating-the-project.rst b/best_practices/creating-the-project.rst
@@ -12,8 +12,8 @@ Installer**, which has to be installed before creating your first project.

    Use the Symfony Installer to create new Symfony-based projects.

-Read the :doc:`installation chapter </book/installation>` of the Symfony Book to
-learn how to install and use the Symfony Installer.
+Read the :doc:`/setup` article learn how to install and use the Symfony
+Installer.

 .. _linux-and-mac-os-x-systems:
 .. _windows-systems:
@@ -125,7 +125,7 @@ more concise and easier to understand.
 .. note::

    Another reason to create a new bundle is when you're overriding something
-    in a vendor's bundle (e.g. a controller). See :doc:`/cookbook/bundles/inheritance`.
+    in a vendor's bundle (e.g. a controller). See :doc:`/bundles/inheritance`.

 All in all, this is the typical directory structure of a Symfony application
 that follows these best practices:
@@ -165,10 +165,10 @@ Extending the Directory Structure

 If your project or infrastructure requires some changes to the default directory
 structure of Symfony, you can
-:doc:`override the location of the main directories </cookbook/configuration/override_dir_structure>`:
+:doc:`override the location of the main directories </configuration/override_dir_structure>`:
 ``cache/``, ``logs/`` and ``web/``.

 .. _`Composer`: https://getcomposer.org/
 .. _`Phar extension`: http://php.net/manual/en/intro.phar.php
 .. _`public checksums repository`: https://github.com/sensiolabs/checksums
-.. _`these steps`: http://fabien.potencier.org/signing-project-releases.html
+.. _`these steps`: http://fabien.potencier.org/signing-project-releases.html
diff --git a/best_practices/forms.rst b/best_practices/forms.rst
@@ -69,8 +69,7 @@ To use the class, use ``createForm()`` and pass the fully qualified class name::
 Registering Forms as Services
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

-You can also
-:ref:`register your form type as a service <form-cookbook-form-field-service>`.
+You can also :ref:`register your form type as a service <form-field-service>`.
 This is only needed if your form type requires some dependencies to be injected
 by the container, otherwise it is unnecessary overhead and therefore *not*
 recommended to do this for all form type classes.
@@ -167,9 +166,8 @@ all of the fields:

 If you need more control over how your fields are rendered, then you should
 remove the ``form_widget(form)`` function and render your fields individually.
-See the :doc:`/cookbook/form/form_customization` cookbook article for more information
-on this and how you can control *how* the form renders at a global level
-using form theming.
+See :doc:`/form/form_customization` for more information on this and how you
+can control *how* the form renders at a global level using form theming.

 Handling Form Submits
 ---------------------