Fix build errors

wouterj · wouterj · commit 92e726e1c465 · 2016-07-13T11:07:06.000+02:00
diff --git a/_images/http/request-flow.png b/_images/http/request-flow.png
diff --git a/components/debug.rst b/components/debug.rst
@@ -33,7 +33,7 @@ Enabling them all is as easy as it can get::
 
 The :method:`Symfony\\Component\\Debug\\Debug::enable` method registers an
 error handler, an exception handler and
-:doc:`a special class loader </components/debug/class_loader>`.
+:ref:`a special class loader <component-debug-class-loader>`.
 
 Read the following sections for more information about the different available
 tools.
@@ -69,7 +69,7 @@ and more useful::
 
 .. note::
 
-    If the :doc:`HttpFoundation component </components/http_foundation` is
+    If the :doc:`HttpFoundation component </components/http_foundation>` is
     available, the handler uses a Symfony Response object; if not, it falls
     back to a regular PHP response.
 
diff --git a/components/routing.rst b/components/routing.rst
@@ -91,7 +91,7 @@ A full route definition can contain up to seven parts:
    are the least commonly needed.
 
 #. A host. This is matched against the host of the request. See
-   :doc:`/components/routing/hostname_pattern` for more details.
+   :doc:`/routing/hostname_pattern` for more details.
 
 #. An array of schemes. These enforce a certain HTTP scheme (``http``, ``https``).
 
@@ -188,8 +188,8 @@ with this class via its constructor::
 .. _components-routing-http-foundation:
 
 Normally you can pass the values from the ``$_SERVER`` variable to populate the
-:class:`Symfony\\Component\\Routing\\RequestContext`. But If you use the
-:doc:`HttpFoundation </components/http_foundation/index>` component, you can use its
+:class:`Symfony\\Component\\Routing\\RequestContext`. But if you use the
+:doc:`HttpFoundation </components/http_foundation>` component, you can use its
 :class:`Symfony\\Component\\HttpFoundation\\Request` class to feed the
 :class:`Symfony\\Component\\Routing\\RequestContext` in a shortcut::
 
diff --git a/components/serializer.rst b/components/serializer.rst
@@ -36,7 +36,7 @@ You can install the component in 2 different ways:
 
 .. include:: /components/require_autoload.rst.inc
 
-To use the ``ObjectNormalizer``, the :doc:`PropertyAccess component </components/property_access/index>`
+To use the ``ObjectNormalizer``, the :doc:`PropertyAccess component </components/property_access>`
 must also be installed.
 
 Usage
@@ -502,7 +502,7 @@ Normalizers
 There are several types of normalizers available:
 
 :class:`Symfony\\Component\\Serializer\\Normalizer\\ObjectNormalizer`
-    This normalizer leverages the :doc:`PropertyAccess Component </components/property_access/index>`
+    This normalizer leverages the :doc:`PropertyAccess Component </components/property_access>`
     to read and write in the object. It means that it can access to properties
     directly and through getters, setters, hassers, adders and removers. It supports
     calling the constructor during the denormalization process.
diff --git a/components/templating.rst b/components/templating.rst
@@ -141,8 +141,8 @@ The Templating component can be easily extended via helpers. Helpers are PHP obj
 provide features useful in a template context. The component has
 2 built-in helpers:
 
-* :doc:`/components/templating/helpers/assetshelper`
-* :doc:`/components/templating/helpers/slotshelper`
+* :doc:`/components/templating/assetshelper`
+* :doc:`/components/templating/slotshelper`
 
 Before you can use these helpers, you need to register them using
 :method:`Symfony\\Component\\Templating\\PhpEngine::set`::
diff --git a/components/translation.rst b/components/translation.rst
@@ -92,7 +92,7 @@ Loader too. The default loaders are:
 * :class:`Symfony\\Component\\Translation\\Loader\\YamlFileLoader` - to load
   catalogs from Yaml files (requires the :doc:`Yaml component</components/yaml>`).
 
-All file loaders require the :doc:`Config component </components/config/index>`.
+All file loaders require the :doc:`Config component </components/config>`.
 
 You can also :doc:`create your own Loader </components/translation/custom_formats>`,
 in case the format is not already supported by one of the default loaders.
diff --git a/configuration/front_controllers_and_kernel.rst b/configuration/front_controllers_and_kernel.rst
@@ -45,7 +45,7 @@ to `decorate`_ the kernel with additional features. Examples include:
 * Configuring the autoloader or adding additional autoloading mechanisms;
 * Adding HTTP level caching by wrapping the kernel with an instance of
   :ref:`AppCache <symfony-gateway-cache>`;
-* Enabling (or skipping) the :doc:`ClassCache </debugging>`;
+* Enabling (or skipping) the :doc:`ClassCache </debug/debugging>`;
 * Enabling the :doc:`Debug Component </components/debug>`.
 
 The front controller can be chosen by requesting URLs like:
diff --git a/create_framework/http_foundation.rst b/create_framework/http_foundation.rst
@@ -281,7 +281,7 @@ cases by yourself. Why not using a technology that already works?
 
     If you want to learn more about the HttpFoundation component, you can have
     a look at the :namespace:`Symfony\\Component\\HttpFoundation` API or read
-    its dedicated :doc:`documentation </components/http_foundation/index>`.
+    its dedicated :doc:`documentation </components/http_foundation>`.
 
 Believe or not but we have our first framework. You can stop now if you want.
 Using just the Symfony HttpFoundation component already allows you to write
diff --git a/doctrine/event_listeners_subscribers.rst b/doctrine/event_listeners_subscribers.rst
@@ -23,7 +23,7 @@ Configuring the Listener/Subscriber
 -----------------------------------
 
 To register a service to act as an event listener or subscriber you just have
-to :ref:`tag <book-service-container-tags>` it with the appropriate name. Depending
+to :doc:`tag </service_container/tags>` it with the appropriate name. Depending
 on your use-case, you can hook a listener into every DBAL connection and ORM
 entity manager or just into one specific DBAL connection and all the entity
 managers that use this connection.
diff --git a/email/testing.rst b/email/testing.rst
@@ -8,7 +8,7 @@ Sending emails with Symfony is pretty straightforward thanks to the
 SwiftmailerBundle, which leverages the power of the `Swift Mailer`_ library.
 
 To functionally test that an email was sent, and even assert the email subject,
-content or any other headers, you can use :doc:`the Symfony Profiler </profiler/index>`.
+content or any other headers, you can use :doc:`the Symfony Profiler </profiler>`.
 
 Start with an easy controller action that sends an email::
 
diff --git a/expressions.rst b/expressions.rst
@@ -11,8 +11,8 @@ logic inside configuration.
 The Symfony Framework leverages expressions out of the box in the following
 ways:
 
-* :ref:`Configuring services <book-services-expressions>`;
-* :ref:`Route matching conditions <book-routing-conditions>`;
+* :doc:`Configuring services </service_container/expression_language>`;
+* :doc:`Route matching conditions </routing/conditions>`;
 * :ref:`Checking security <book-security-expressions>` (explained below) and
   :ref:`access controls with allow_if <book-security-allow-if>`;
 * :doc:`Validation </reference/constraints/Expression>`.
diff --git a/http_fundamentals.rst b/http_fundamentals.rst
@@ -361,15 +361,15 @@ to do:
 
 .. _request-flow-figure:
 
-.. figure:: /images/request-flow.png
+.. figure:: /_images/http/request-flow.png
    :align: center
    :alt: Symfony request flow
 
    Incoming requests are interpreted by the :doc:`Routing component </routing>` and
    passed to PHP functions that return ``Response`` objects.
 
-This may not make sense yet, but as you keep reading, you'll learn about :ref:`routes </routing>`
-and :ref:`controllers </controller>`: the two fundamental parts to creating a page.
+This may not make sense yet, but as you keep reading, you'll learn about :doc:`routes </routing>`
+and :doc:`controllers </controller>`: the two fundamental parts to creating a page.
 But as you go along, don't forget that no matter *how* complex your app gets, your
 job is always the same: read information from the Request and use it to create a
 Response.
diff --git a/install/unstable_versions.rst b/install/unstable_versions.rst
@@ -8,7 +8,7 @@ Creating a New Project Based on an Unstable Symfony Version
 -----------------------------------------------------------
 
 Suppose that Symfony 2.7 version hasn't been released yet and you want to create
-a new project to test its features. First, :doc:`install the Composer </composer>`
+a new project to test its features. First, :doc:`install the Composer </composer/installation>`
 package manager. Then, open a command console, enter your project's directory and
 execute the following command:
 
diff --git a/introduction/from_flat_php_to_symfony2.rst b/introduction/from_flat_php_to_symfony2.rst
@@ -667,7 +667,7 @@ object are sent back to the client.
 
 It's a beautiful thing.
 
-.. figure:: /images/request-flow.png
+.. figure:: /_images/http/request-flow.png
    :align: center
    :alt: Symfony request flow
 
diff --git a/profiler/data_collector.rst b/profiler/data_collector.rst
@@ -4,7 +4,7 @@
 How to Create a custom Data Collector
 =====================================
 
-The :doc:`Symfony Profiler </profiler/index>` delegates data collection
+The :doc:`Symfony Profiler </profiler>` delegates data collection
 to some special classes called data collectors. Symfony comes bundled with a few
 of them, but you can easily create your own.
 
diff --git a/psr/psr7.rst b/psr/psr7.rst
@@ -4,7 +4,7 @@
 The PSR-7 Bridge
 ================
 
-    The PSR-7 bridge converts :doc:`HttpFoundation </components/http_foundation/index>`
+    The PSR-7 bridge converts :doc:`HttpFoundation </components/http_foundation>`
     objects from and to objects implementing HTTP message interfaces defined
     by the `PSR-7`_.
 
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -681,7 +681,7 @@ strict_requirements
 **type**: ``mixed`` **default**: ``true``
 
 Determines the routing generator behaviour. When generating a route that
-has specific :ref:`requirements <book-routing-requirements>`, the generator
+has specific :doc:`requirements </routing/requirements>`, the generator
 can behave differently in case the used parameters do not meet these requirements.
 
 The value can be one of:
diff --git a/reference/dic_tags.rst b/reference/dic_tags.rst
@@ -6,7 +6,7 @@ to "flag" it to be used in some special way. For example, if you have a
 service that you would like to register as a listener to one of Symfony's
 core events, you can flag it with the ``kernel.event_listener`` tag.
 
-You can learn a little bit more about "tags" by reading the ":ref:`book-service-container-tags`"
+You can learn a little bit more about "tags" by reading the ":doc:`/service_container/tags`"
 section of the Service Container chapter.
 
 Below is information about all of the tags available inside Symfony. There
diff --git a/routing.rst b/routing.rst
@@ -139,7 +139,7 @@ which controller should be executed. The whole process looks like this:
 #. The Symfony Kernel executes the controller, which ultimately returns
    a ``Response`` object.
 
-.. figure:: /images/request-flow.png
+.. figure:: /_images/http/request-flow.png
    :align: center
    :alt: Symfony request flow
 
@@ -201,7 +201,7 @@ file:
     Even though all routes are loaded from a single file, it's common practice
     to include additional routing resources. To do so, just point out in the
     main routing configuration file which external files should be included.
-    See the :ref:`routing-include-external-resources` section for more
+    See the :doc:`/routing/external_resources` section for more
     information.
 
 Basic Route Configuration
diff --git a/routing/requirements.rst b/routing/requirements.rst
@@ -95,7 +95,7 @@ URL                     Route     Parameters
 ======================  ========  ===============================
 
 The answer to the problem is to add route *requirements* or route *conditions*
-(see :ref:`book-routing-conditions`). The routes in this example would work
+(see :doc:`/routing/conditions`). The routes in this example would work
 perfectly if the ``/blog/{page}`` path *only* matched URLs where the ``{page}``
 portion is an integer. Fortunately, regular expression requirements can easily
 be added for each parameter. For example:
@@ -373,5 +373,5 @@ Adding a Host Requirement
 -------------------------
 
 You can also match on the HTTP *host* of the incoming request. For more
-information, see :doc:`/components/routing/hostname_pattern` in the Routing
+information, see :doc:`/routing/hostname_pattern` in the Routing
 component documentation.
diff --git a/security/securing_services.rst b/security/securing_services.rst
@@ -144,7 +144,7 @@ You can also secure method calls in any service with annotations by using the
 optional `JMSSecurityExtraBundle`_ bundle. This bundle is not included in the
 Symfony Standard Distribution, but you can choose to install it.
 
-To enable the annotations functionality, :ref:`tag <book-service-container-tags>`
+To enable the annotations functionality, :doc:`tag </service_container/tags>`
 the service you want to secure with the ``security.secure_service`` tag
 (you can also automatically enable this functionality for all services, see
 the :ref:`sidebar <securing-services-annotations-sidebar>` below):
diff --git a/service_container/scopes.rst b/service_container/scopes.rst
@@ -14,7 +14,7 @@ This article is all about scopes, a somewhat advanced topic related to the
     is to inject the ``request_stack`` service instead and access the current
     Request by calling the
     :method:`Symfony\\Component\\HttpFoundation\\RequestStack::getCurrentRequest`
-    method (see :ref:`book-container-request-stack`). The rest of this entry
+    method (see :doc:`/service_container/request`). The rest of this entry
     talks about scopes in a theoretical and more advanced way. If you're
     dealing with scopes for the ``request`` service, simply inject ``request_stack``.
 
diff --git a/testing/profiling.rst b/testing/profiling.rst
@@ -9,7 +9,7 @@ you write functional tests that monitor your production servers, you might
 want to write tests on the profiling data as it gives you a great way to check
 various things and enforce some metrics.
 
-:doc:`The Symfony Profiler </profiler/index>` gathers a lot of data for
+:doc:`The Symfony Profiler </profiler>` gathers a lot of data for
 each request. Use this data to check the number of database calls, the time
 spent in the framework, etc. But before writing assertions, enable the profiler
 and check that the profiler is indeed available (it is enabled by default in
