Merge remote-tracking branch 'upstream/master'

Author: javiereguiluz

.github/CONTRIBUTING.md

@@ -2,6 +2,4 @@ Contributing
 ------------
 
 We love contributors! For more information on how you can contribute to the
-Symfony documentation, please read [Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html)
-and notice the [Pull Request Format](https://symfony.com/doc/current/contributing/documentation/overview.html#pull-request-format)
-that helps us merge your pull requests faster!
+Symfony documentation, please read [Contributing to the Documentation](https://symfony.com/doc/current/contributing/documentation/overview.html).

.platform.app.yaml

@@ -46,7 +46,7 @@ disk: 512
 # Build time dependencies.
 dependencies:
   python:
-    sphinx: ">=1"
+    sphinx: "1.3.6"
 
 # The hooks that will be performed when the package is deployed.
 hooks:

_build/redirection_map

@@ -2,6 +2,7 @@
 /cookbook/index /index
 /book/stable_api /contributing/code/bc
 /book/internals /reference/events
+/configuration/apache_router /routing
 /cookbook/console/sending_emails /cookbook/console/request_context
 /cookbook/deployment-tools /cookbook/deployment/tools
 /cookbook/doctrine/migrations /bundles/DoctrineFixturesBundle/index
@@ -95,7 +96,7 @@
 /cookbook/cache/form_csrf_caching /http_cache/form_csrf_caching
 /cookbook/cache/varnish /http_cache/varnish
 /cookbook/composer /setup/composer
-/cookbook/configuration/apache_router /configuration/apache_router
+/cookbook/configuration/apache_router /routing
 /cookbook/configuration/configuration_organization /configuration/configuration_organization
 /cookbook/configuration/environments /configuration/environments
 /cookbook/configuration/external_parameters /configuration/external_parameters
@@ -330,3 +331,4 @@
 /components/yaml/index /components/yaml
 /deployment/tools /deployment
 /install/bundles /setup/bundles
+/form /forms

bundles/extension.rst

@@ -142,7 +142,7 @@ their fully qualified class names::
     {
         // ...
 
-         $this->addClassesToCompile(array(
+        $this->addClassesToCompile(array(
             'AppBundle\\Manager\\UserManager',
             'AppBundle\\Utils\\Slugger',
             // ...

bundles/override.rst

@@ -37,39 +37,10 @@ If the controller is a service, see the next section on how to override it.
 Services & Configuration
 ------------------------
 
-In order to override/extend a service, there are two options. First, you can
-set the parameter holding the service's class name to your own class by setting
-it in ``app/config/config.yml``. This of course is only possible if the class name is
-defined as a parameter in the service config of the bundle containing the
-service. For example, to override the class used for Symfony's ``translator``
-service, you would override the ``translator.class`` parameter. Knowing exactly
-which parameter to override may take some research. For the translator, the
-parameter is defined and used in the ``Resources/config/translation.xml`` file
-in the core FrameworkBundle:
-
-.. configuration-block::
-
-    .. code-block:: yaml
-
-        # app/config/config.yml
-        parameters:
-            translator.class: Acme\HelloBundle\Translation\Translator
-
-    .. code-block:: xml
-
-        <!-- app/config/config.xml -->
-        <parameters>
-            <parameter key="translator.class">Acme\HelloBundle\Translation\Translator</parameter>
-        </parameters>
-
-    .. code-block:: php
-
-        // app/config/config.php
-        $container->setParameter('translator.class', 'Acme\HelloBundle\Translation\Translator');
-
-Secondly, if the class is not available as a parameter, you want to make sure the
-class is always overridden when your bundle is used or if you need to modify
-something beyond just the class name, you should use a compiler pass::
+If you want to modify service definitions of another bundle, you can use a compiler
+pass to change the class of the service or to modify method calls. In the following
+example, the implementing class for the ``original-service-id`` is changed to 
+``Acme\DemoBundle\YourService``::
 
     // src/Acme/DemoBundle/DependencyInjection/Compiler/OverrideServiceCompilerPass.php
     namespace Acme\DemoBundle\DependencyInjection\Compiler;
@@ -86,12 +57,7 @@ something beyond just the class name, you should use a compiler pass::
         }
     }
 
-In this example you fetch the service definition of the original service, and set
-its class name to your own class.
-
-See :doc:`/service_container/compiler_passes` for information on how to use
-compiler passes. If you want to do something beyond just overriding the class,
-like adding a method call, you can only use the compiler pass method.
+For more information on compiler passes, see :doc:`/service_container/compiler_passes`.
 
 Entities & Entity Mapping
 -------------------------