Merge branch '5.0'

* 5.0:
  Update extending.rst
  Update example to use tagged_locator helper function

Author: OskarStark

components/expression_language/extending.rst

@@ -49,7 +49,7 @@ Example::
 
 In addition to the custom function arguments, the **evaluator** is passed an
 ``arguments`` variable as its first argument, which is equal to the second
-argument of ``compile()`` (e.g. the "values" when evaluating an expression).
+argument of ``evaluate()`` (e.g. the "values" when evaluating an expression).
 
 .. _components-expression-language-provider:
 

service_container/service_subscribers_locators.rst

@@ -544,7 +544,7 @@ attribute to the locator service defining the name of this custom method:
         return function(ContainerConfigurator $configurator) {
             $configurator->services()
                 ->set(App\HandlerCollection::class)
-                    ->args([service_locator(tagged('app.handler', null, 'myOwnMethodName'))])
+                    ->args([tagged_locator('app.handler', null, 'myOwnMethodName')])
             ;
         };