Merge branch '4.2'

weaverryan · weaverryan · commit 156eb9bf69fb · 2019-02-02T23:09:20.000-05:00
* 4.2:
  Fixing build
  fixing build
diff --git a/bundles/best_practices.rst b/bundles/best_practices.rst
@@ -250,7 +250,7 @@ With this, :doc:`Symfony Flex </setup/flex>` will be able to automatically
 enable your bundle when it's installed.
 
 If your bundle requires any setup (e.g. configuration, new files, changes to
-`.gitignore`, etc), then you should create a `Symfony Flex recipe`_.
+``.gitignore``, etc), then you should create a `Symfony Flex recipe`_.
 
 Documentation
 -------------
diff --git a/components/var_dumper.rst b/components/var_dumper.rst
@@ -221,10 +221,10 @@ option. Read more about this and other options in
 
     If the dumped contents are complex, consider using the local search box to
     look for specific variables or values. First, click anywhere on the dumped
-    contents and then press :kbd:`Ctrl. + F` or :kbd:`Cmd. + F` to make the local
+    contents and then press ``Ctrl. + F`` or ``Cmd. + F`` to make the local
     search box appear. All the common shortcuts to navigate the search results
-    are supported (:kbd:`Ctrl. + G` or :kbd:`Cmd. + G`, :kbd:`F3`, etc.) When
-    finished, press :kbd:`Esc.` to hide the box again.
+    are supported (``Ctrl. + G`` or ``Cmd. + G``, ``F3``, etc.) When
+    finished, press ``Esc.`` to hide the box again.
 
 Using the VarDumper Component in your PHPUnit Test Suite
 --------------------------------------------------------
diff --git a/getting_started/index.rst b/getting_started/index.rst
@@ -4,9 +4,9 @@ Getting Started
 .. toctree::
     :maxdepth: 1
 
-    ../setup
-    ../page_creation
-    ../routing
-    ../controller
-    ../templating
-    ../configuration
+    /setup
+    /page_creation
+    /routing
+    /controller
+    /templating
+    /configuration
diff --git a/routing.rst b/routing.rst
@@ -774,7 +774,7 @@ Route path  If the requested URL is ``/foo``          If the requested URL is ``
 ----------  ----------------------------------------  ------------------------------------------
 ``/foo``    It matches (``200`` status response)      It makes a ``301`` redirect to ``/foo``
 ``/foo/``   It makes a ``301`` redirect to ``/foo/``  It matches (``200`` status response)
-==========  ========================================  ==========================================
+----------  ----------------------------------------  ------------------------------------------
 
 .. note::
 
diff --git a/web_link.rst b/web_link.rst
@@ -55,7 +55,7 @@ To do that, first install the WebLink component:
 Now, update the template to use the ``preload()`` Twig function provided by
 WebLink:
 
-.. code:: twig
+.. code-block:: twig
 
     <head>
        {# ... #}
@@ -69,7 +69,7 @@ requested the HTML page.
 Additionally, according to `the Priority Hints specification`_, you can signal
 the priority of the resource to download using the ``importance`` attribute:
 
-.. code:: twig
+.. code-block:: twig
 
     <head>
        {# ... #}
@@ -99,7 +99,7 @@ improve performance of your apps in production right now.
 If you want to prevent the push but let the browser preload the resource by
 issuing an early separate HTTP request, use the ``nopush`` option:
 
-.. code:: twig
+.. code-block:: twig
 
     <head>
        {# ... #}
@@ -132,7 +132,7 @@ The component also supports sending HTTP links not related to performance and
 any link implementing the `PSR-13`_ standard. For instance, any
 `link defined in the HTML specification`_:
 
-.. code:: twig
+.. code-block:: twig
 
     <head>
        {# ... #}
