FriendsOfSymfony · dbu · Oct 23, 2018 · Oct 23, 2018
diff --git a/Resources/doc/conf.py b/Resources/doc/conf.py
@@ -249,6 +249,6 @@
 intersphinx_mapping = {'foshttpcache': ('http://foshttpcache.readthedocs.org/en/latest/', None)}
 
 rst_epilog = """
-.. _expressions: http://symfony.com/doc/current/components/expression_language/index.html
+.. _expressions: https://symfony.com/doc/current/components/expression_language.html
 .. _FOSHttpCache: https://github.com/FriendsOfSymfony/FOSHttpCache
 """
diff --git a/Resources/doc/features/headers.rst b/Resources/doc/features/headers.rst
@@ -69,5 +69,5 @@ This is an example configuration. For more, see the
  cache_control: { public: true, max_age: 15, s_maxage: 30 }
  etag: "strong"
 
-.. _manually setting cache headers: http://symfony.com/doc/current/book/http_cache.html#the-cache-control-header
-.. _setting caching headers through annotations: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html
+.. _manually setting cache headers: https://symfony.com/doc/current/http_cache.html#the-cache-control-header
+.. _setting caching headers through annotations: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/cache.html
diff --git a/Resources/doc/features/symfony-http-cache.rst b/Resources/doc/features/symfony-http-cache.rst
@@ -122,4 +122,4 @@ than creating one::
 Once your bootstrapping is adjusted, set the configuration option
 ``fos_http_cache.proxy_client.symfony.use_kernel_dispatcher: true``.
 
-.. _Symfony HttpCache documentation: http://symfony.com/doc/current/book/http_cache.html#symfony-reverse-proxy
+.. _Symfony HttpCache documentation: https://symfony.com/doc/current/http_cache.html#symfony-reverse-proxy
diff --git a/Resources/doc/features/tagging.rst b/Resources/doc/features/tagging.rst
@@ -169,4 +169,4 @@ See the :ref:`@Tag reference <tag>` for full details.
 
 .. _Tagged Cache Invalidation: http://blog.kevburnsjr.com/tagged-cache-invalidation
 .. _Linked Cache Invalidation: http://tools.ietf.org/html/draft-nottingham-linked-cache-inv-03
-.. _expressions: http://symfony.com/doc/current/components/expression_language/index.html
+.. _expressions: https://symfony.com/doc/current/components/expression_language.html
diff --git a/Resources/doc/features/user-context.rst b/Resources/doc/features/user-context.rst
@@ -63,7 +63,7 @@ controller, as the request listener will abort the request right after the
 firewall has been applied, but the route definition must exist. Use the same
 path as you specified in the caching proxy and make sure that this path is
 allowed for anonymous users and covered by your
-`firewall configuration <http://symfony.com/doc/current/book/security.html>`_:
+`firewall configuration`_:
 
 .. code-block:: yaml
 
@@ -135,3 +135,4 @@ You can do so by configuring :ref:`hash_cache_ttl`.
 .. _CORS requests: https://developer.mozilla.org/en-US/docs/Web/HTTP/Access_control_CORS
 .. _terminal42/header-replay-bundle: https://github.com/terminal42/header-replay-bundle
 .. _HeaderReplayBundle documentation: https://github.com/terminal42/header-replay-bundle#terminal42header-replay-bundle
+.. _firewall configuration: https://symfony.com/doc/current/security.html#a-authentication-firewalls
diff --git a/Resources/doc/includes/expression-language.rst b/Resources/doc/includes/expression-language.rst
@@ -7,6 +7,6 @@ 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.
 
-.. _expression language component: http://symfony.com/doc/current/components/expression_language/index.html
-.. _define it as a service: http://symfony.com/doc/current/cookbook/controller/service.html
-.. _custom expression language: http://symfony.com/doc/current/components/expression_language/extending.html
+.. _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
+.. _custom expression language: https://symfony.com/doc/current/components/expression_language/extending.html
diff --git a/Resources/doc/overview.rst b/Resources/doc/overview.rst
@@ -108,7 +108,7 @@ This bundle is released under the MIT license.
  :language: none
 
 .. _Packagist: https://packagist.org/packages/friendsofsymfony/http-cache-bundle
-.. _SensioFrameworkExtraBundle: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
-.. _ExpressionLanguage: http://symfony.com/doc/current/components/expression_language/introduction.html
-.. _Symfony: http://symfony.com/doc/current/book/http_cache.html#the-cache-control-header
+.. _SensioFrameworkExtraBundle: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/index.html
+.. _ExpressionLanguage: https://symfony.com/doc/current/components/expression_language.html
+.. _Symfony: https://symfony.com/doc/current/http_cache.html#the-cache-control-header
 .. _client implementations: https://packagist.org/providers/php-http/client-implementation
diff --git a/Resources/doc/reference/annotations.rst b/Resources/doc/reference/annotations.rst
@@ -136,4 +136,4 @@ See :doc:`/features/tagging` for an introduction to tagging.
 If you wish to change the HTTP header used for storing tags, see
 :doc:`/reference/configuration/tags`.
 
-.. _param converter: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
+.. _param converter: https://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
diff --git a/Resources/doc/reference/cache-manager.rst b/Resources/doc/reference/cache-manager.rst
@@ -114,5 +114,5 @@ You can also flush the cache manager manually::
 
  $cacheManager->flush();
 
-.. _kernel.terminate event: http://symfony.com/doc/current/components/http_kernel/introduction.html#the-kernel-terminate-event
-.. _console.terminate event: http://symfony.com/doc/current/components/console/events.html#the-consoleevents-terminate-event
+.. _kernel.terminate event: https://symfony.com/doc/current/components/http_kernel.html#the-kernel-terminate-event
+.. _console.terminate event: https://symfony.com/doc/current/components/console/events.html#the-consoleevents-terminate-event
diff --git a/Resources/doc/reference/configuration/match.rst b/Resources/doc/reference/configuration/match.rst
@@ -149,6 +149,6 @@ regular expressions.
  match:
  attributes: { _controller: ^AcmeBundle:Default:.* }
 
-.. _Trusting Proxies: http://symfony.com/doc/current/components/http_foundation/trusting_proxies.html
-.. _controllers as services: http://symfony.com/doc/current/cookbook/controller/service.html
+.. _Trusting Proxies: https://symfony.com/doc/current/deployment/proxies.html
+.. _controllers as services: https://symfony.com/doc/current/controller/service.html
 .. _RFC 7231: http://tools.ietf.org/html/rfc7231#page-48
diff --git a/Resources/doc/reference/configuration/user-context.rst b/Resources/doc/reference/configuration/user-context.rst
@@ -37,7 +37,7 @@ triggered:
 
 .. important::
 
- If you are using `Symfony security <http://symfony.com/doc/current/book/security.html>`_
+ If you are using `Symfony security`_
  for the hash generation, make sure that this route is inside the firewall
  for which you are doing the cache groups.
 
@@ -266,3 +266,5 @@ is called when the hash is generated.
  ->register('acme.demo_bundle.my_service', '%acme.demo_bundle.my_service.class%')
  ->addTag('fos_http_cache.user_context_provider', array('priority' => 10))
  ;
+
+.. _Symfony security: https://symfony.com/doc/current/security.html