Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit c6b5eb789c8a · 2018-11-07T09:05:18.000+01:00
* 3.4:
  Fix web_link component name
diff --git a/components/web_link.rst b/components/web_link.rst
@@ -35,7 +35,7 @@ The following example shows the component in action::
 
    echo 'Hello';
 
-Read the full :doc:`WebLink documentation </weblink>` to learn about all the
+Read the full :doc:`WebLink documentation </web_link>` to learn about all the
 features of the component and its integration with the Symfony framework.
 
 .. _`Web Linking`: https://tools.ietf.org/html/rfc5988
diff --git a/index.rst b/index.rst
@@ -53,7 +53,7 @@ Topics
     testing
     translation
     validation
-    weblink
+    web_link
     workflow
 
 Best Practices
diff --git a/web_link.rst b/web_link.rst
@@ -1,7 +1,7 @@
 Asset Preloading and Resource Hints with HTTP/2 and WebLink
 ===========================================================
 
-Symfony provides native support (via the :doc:`WebLink component </components/weblink>`)
+Symfony provides native support (via the :doc:`WebLink component </components/web_link>`)
 for managing ``Link`` HTTP headers, which are the key to improve the application
 performance when using HTTP/2 and preloading capabilities of modern web browsers.
 
@@ -156,7 +156,7 @@ You can also add links to the HTTP response directly from controllers and servic
 
 .. seealso::
 
-    WebLink can be used :doc:`as a standalone PHP library </components/weblink>`
+    WebLink can be used :doc:`as a standalone PHP library </components/web_link>`
     without requiring the entire Symfony framework.
 
 .. _`HTTP/2 Server Push`: https://tools.ietf.org/html/rfc7540#section-8.2
