Merge pull request #615 from FriendsOfSymfony/fix-interlinking

fix readthedocs interlinking and some reference bugs

Resources/doc/conf.py

@@ -14,6 +14,7 @@
 extensions = [
     'sphinxcontrib.spelling',
     'sphinx_rtd_theme',
+    "sphinx.ext.intersphinx",
 ]
 
 # Spelling configuration
@@ -197,7 +198,7 @@
 
 # --------------
 
-intersphinx_mapping = {'foshttpcache': ('http://foshttpcache.readthedocs.org/en/latest/', None)}
+intersphinx_mapping = {'foshttpcache': ('http://foshttpcache.readthedocs.io/en/latest/', None)}
 
 rst_epilog = """
 .. _expressions: https://symfony.com/doc/current/components/expression_language.html

Resources/doc/includes/expression-language.rst

@@ -4,8 +4,8 @@
 **type**: ``string``
 
 If your application is using a `custom expression language`_ which is extended
-from Symfony's `expression language component`_, you can `define it as a service`_
-and include it in the configuration.
+from Symfony's `expression language component`_, you need to `define it as a service`_
+and configure it as `expression_language` in the sections where you want to use it.
 
 .. _expression language component: https://symfony.com/doc/current/components/expression_language.html
 .. _define it as a service: https://symfony.com/doc/current/controller/service.html

Resources/doc/overview.rst

@@ -71,7 +71,7 @@ And , if you don't use a recent version of Symfony, include it in your project::
 ExpressionLanguage
 ~~~~~~~~~~~~~~~~~~
 
-If you wish to use expressions_ in your annotations , you also need Symfony’s
+If you wish to use expressions in your annotations , you also need Symfony’s
 ExpressionLanguage_ component. If you’re not using full-stack Symfony 2.4 or
 later, you need to explicitly add the component:
 

Resources/doc/reference/configuration/tags.rst

@@ -137,7 +137,7 @@ unsafe requests.
 **type**: ``array``
 
 You can dynamically refer to request attributes using
-:ref:`expressions <expression language requirement>`. Assume a route
+:ref:`expressions <requirements>`. Assume a route
 ``/articles/{id}``. A request to path ``/articles/123`` will set/invalidate
 tag ``articles-123`` with the following configuration:
 

src/DependencyInjection/Configuration.php

@@ -809,7 +809,7 @@ private function addTagSection(ArrayNodeDefinition $rootNode)
                         ->booleanNode('strict')->defaultFalse()->end()
                         ->scalarNode('expression_language')
                             ->defaultNull()
-                            ->info('Service name of a custom ExpressionLanugage to use.')
+                            ->info('Service name of a custom ExpressionLanguage to use.')
                         ->end()
                         ->scalarNode('response_header')
                             ->defaultNull()
@@ -831,7 +831,7 @@ private function addTagSection(ArrayNodeDefinition $rootNode)
                                     ->ifTrue(function ($v) {
                                         return !empty($v['tag_expressions']) && !class_exists(ExpressionLanguage::class);
                                     })
-                                    ->thenInvalid('Configured a tag_expression but ExpressionLanugage is not available')
+                                    ->thenInvalid('Configured a tag_expression but ExpressionLanguage is not available')
                                 ->end()
                                 ->children()
         ;
@@ -864,7 +864,7 @@ private function addInvalidationSection(ArrayNodeDefinition $rootNode)
                         ->end()
                         ->scalarNode('expression_language')
                             ->defaultNull()
-                            ->info('Service name of a custom ExpressionLanugage to use.')
+                            ->info('Service name of a custom ExpressionLanguage to use.')
                         ->end()
                         ->arrayNode('rules')
                             ->info('Set what requests should invalidate which target routes.')