symfony
diff --git a/‎bundles/override.rst
+1-1 b/‎bundles/override.rst
+1-1
diff --git a/‎controller.rst
+2-1 b/‎controller.rst
+2-1
diff --git a/‎controller/error_pages.rst
+1-1 b/‎controller/error_pages.rst
+1-1
diff --git a/‎event_dispatcher/event_listener.rst
+1-1 b/‎event_dispatcher/event_listener.rst
+1-1
diff --git a/‎http_cache.rst
+1-1 b/‎http_cache.rst
+1-1
diff --git a/‎reference/configuration/framework.rst
+1-1 b/‎reference/configuration/framework.rst
+1-1
diff --git a/‎reference/twig_reference.rst
+2-2 b/‎reference/twig_reference.rst
+2-2
@@ -12,7 +12,7 @@ Templates
 
 For information on overriding templates, see
 
-* :ref:`overriding-bundle-templates`.
+* :doc:`/templating/overriding`.
 * :doc:`/bundles/inheritance`
 
 Routing
 
@@ -483,7 +483,8 @@ creating unnecessarily deep structures::
 Templates are a generic way to render content in *any* format. And while in
 most cases you'll use templates to render HTML content, a template can just
 as easily generate JavaScript, CSS, XML or any other format you can dream of.
-To learn how to render different templating formats read the :ref:`template-formats`
+
+To learn how to render different templating formats read the :doc:`/templating/formats`
 section of the Creating and Using Templates chapter.
 
 The Symfony templating engine is explained in great detail in the
 
@@ -62,7 +62,7 @@ logic to determine the template filename:
 .. _overriding-or-adding-templates:
 
 To override these templates, simply rely on the standard Symfony method for
-:ref:`overriding templates that live inside a bundle <overriding-bundle-templates>`:
+:doc:`overriding templates that live inside a bundle </templating/overriding>`:
 put them in the ``app/Resources/TwigBundle/views/Exception/`` directory.
 
 A typical project that returns HTML and JSON pages, might look like this:
 
@@ -220,7 +220,7 @@ Request Events, Checking Types
 ------------------------------
 
 A single page can make several requests (one master request, and then multiple
-sub-requests - typically by :ref:`templating-embedding-controller`). For the core
+sub-requests - typically by :doc:`/templating/embedding_controllers`). For the core
 Symfony events, you might need to check to see if the event is for a "master" request
 or a "sub request"::
 
 
@@ -1065,7 +1065,7 @@ independent of the rest of the page.
 
 In this example, the full-page cache has a lifetime of ten minutes.
 Next, include the news ticker in the template by embedding an action.
-This is done via the ``render`` helper (See :ref:`templating-embedding-controller`
+This is done via the ``render`` helper (see :doc:`/templating/embedding_controllers`
 for more details).
 
 As the embedded content comes from another page (or controller for that
 
@@ -1143,7 +1143,7 @@ is disabled. This can be either a template name or the content itself.
 
 .. seealso::
 
-    See :ref:`book-templating-hinclude` for more information about hinclude.
+    See :doc:`/templating/hinclude` for more information about hinclude.
 
 .. _reference-templating-form:
 
 
@@ -38,7 +38,7 @@ render
     **type**: ``array`` **default**: ``[]``
 
 Renders the fragment for the given controller (using the `controller`_ function)
-or URI. For more information, see :ref:`templating-embedding-controller`.
+or URI. For more information, see :doc:`/templating/embedding_controllers`.
 
 The render strategy can be specified in the ``strategy`` key of the options.
 
@@ -62,7 +62,7 @@ render_esi
 
 Generates an ESI tag when possible or falls back to the behavior of
 `render`_ function instead. For more information, see
-:ref:`templating-embedding-controller`.
+:doc:`/templating/embedding_controllers`.
 
 .. tip::