Merge branch '2.7' into 2.8

Conflicts:
	_images/quick_tour/hello_fabien.png
	book/installation.rst
	book/routing.rst
	book/service_container.rst
	components/dependency_injection/index.rst
	components/index.rst
	components/map.rst.inc
	controller.rst
	cookbook/assetic/index.rst
	cookbook/configuration/index.rst
	cookbook/map.rst.inc
	cookbook/security/index.rst
	cookbook/service_container/index.rst
	forms.rst
	reference/twig_reference.rst
	security/custom_authentication_provider.rst
	templating.rst

.gitignore

@@ -1,2 +1,3 @@
-/_build
+/_build/doctrees
+/_build/html
 *.pyc

.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:

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'
-

assetic.rst

@@ -0,0 +1,10 @@
+Assetic
+=======
+
+.. include:: /cookbook/assetic/_standard_edition_warning.inc
+
+.. toctree::
+    :maxdepth: 1
+    :glob:
+
+    assetic/*

cookbook/assetic/asset_management.rst → assetic/asset_management.rst

@@ -264,7 +264,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:`/cookbook/assetic/jpeg_optimize`.
+:doc:`/assetic/jpeg_optimize`.
 
 .. tip::
 
@@ -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
 ------------------------

cookbook/assetic/yuicompressor.rst → 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:`/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
 

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

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

best_practices/creating-the-project.rst

@@ -12,7 +12,7 @@ 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
+Read the :doc:`installation chapter </installation>` of the Symfony Book to
 learn how to install and use the Symfony Installer.
 
 .. _linux-and-mac-os-x-systems:
@@ -119,7 +119,7 @@ Symfony documentation uses the AppBundle name.
 .. 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:
@@ -154,7 +154,7 @@ 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/``.
 
 In addition, Symfony3 will use a slightly different directory structure when
@@ -181,4 +181,4 @@ the Symfony directory structure.
 .. _`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

best_practices/forms.rst

@@ -166,7 +166,7 @@ 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
+See the :doc:`/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.
 

best_practices/security.rst

@@ -5,9 +5,9 @@ Authentication and Firewalls (i.e. Getting the User's Credentials)
 ------------------------------------------------------------------
 
 You can configure Symfony to authenticate your users using any method you
-want and to load user information from any source. This is a complex topic,
-but the :doc:`Security Cookbook Section </cookbook/security/index>` has a
-lot of information about this.
+want and to load user information from any source. This is a complex topic, but
+the :doc:`Security Cookbook Section </security>` has a lot of information about
+this.
 
 Regardless of your needs, authentication is configured in ``security.yml``,
 primarily under the ``firewalls`` key.
@@ -127,7 +127,7 @@ Using ``@Security``, this looks like:
 Using Expressions for Complex Security Restrictions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-If your security logic is a little bit more complex, you can use an `expression`_
+If your security logic is a little bit more complex, you can use an :doc:`expression </components/expression_language>`
 inside ``@Security``. In the following example, a user can only access the
 controller if their email matches the value returned by the ``getAuthorEmail``
 method on the ``Post`` object:
@@ -254,7 +254,7 @@ Security Voters
 
 If your security logic is complex and can't be centralized into a method
 like ``isAuthor()``, you should leverage custom voters. These are an order
-of magnitude easier than :doc:`ACLs </cookbook/security/acl>` and will give
+of magnitude easier than :doc:`ACLs </security/acl>` and will give
 you the flexibility you need in almost all cases.
 
 First, create a voter class. The following example shows a voter that implements
@@ -388,18 +388,17 @@ The `FOSUserBundle`_, developed by the Symfony community, adds support for a
 database-backed user system in Symfony. It also handles common tasks like
 user registration and forgotten password functionality.
 
-Enable the :doc:`Remember Me feature </cookbook/security/remember_me>` to
+Enable the :doc:`Remember Me feature </security/remember_me>` to
 allow your users to stay logged in for a long period of time.
 
 When providing customer support, sometimes it's necessary to access the application
 as some *other* user so that you can reproduce the problem. Symfony provides
-the ability to :doc:`impersonate users </cookbook/security/impersonating_user>`.
+the ability to :doc:`impersonate users </security/impersonating_user>`.
 
 If your company uses a user login method not supported by Symfony, you can
-develop :doc:`your own user provider </cookbook/security/custom_provider>` and
-:doc:`your own authentication provider </cookbook/security/custom_authentication_provider>`.
+develop :doc:`your own user provider </security/custom_provider>` and
+:doc:`your own authentication provider </security/custom_authentication_provider>`.
 
 .. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
 .. _`@Security annotation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
-.. _`expression`: http://symfony.com/doc/current/components/expression_language/introduction.html
 .. _`FOSUserBundle`: https://github.com/FriendsOfSymfony/FOSUserBundle

best_practices/web-assets.rst

@@ -51,7 +51,7 @@ tools like GruntJS.
     Use Assetic to compile, combine and minimize web assets, unless you're
     comfortable with frontend tools like GruntJS.
 
-:doc:`Assetic </cookbook/assetic/asset_management>` is an asset manager capable
+:doc:`Assetic </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:
@@ -89,8 +89,8 @@ Learn More about Assetic
 ------------------------
 
 Assetic can also minimize CSS and JavaScript assets
-:doc:`using UglifyCSS/UglifyJS </cookbook/assetic/uglifyjs>` to speed up your
-websites. You can even :doc:`compress images </cookbook/assetic/jpeg_optimize>`
+:doc:`using UglifyCSS/UglifyJS </assetic/uglifyjs>` to speed up your
+websites. You can even :doc:`compress images </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.