Fix wrong references

wouterj · wouterj · commit 6938b8cb75f8 · 2016-07-13T15:36:49.000+02:00
diff --git a/event_dispatcher/event_listener.rst b/event_dispatcher/event_listener.rst
@@ -12,7 +12,7 @@ them by executing any piece of code.
 Internal events provided by Symfony itself are defined in the
 :class:`Symfony\\Component\\HttpKernel\\KernelEvents` class. Third-party bundles
 and libraries also trigger lots of events and your own application can trigger
-:doc:`custom events </components/event_dispatcher/index>`.
+:doc:`custom events </components/event_dispatcher>`.
 
 All the examples shown in this article use the same ``KernelEvents::EXCEPTION``
 event for consistency purposes. In your own application, you can use any event
diff --git a/index.rst b/index.rst
@@ -11,10 +11,7 @@ Symfony Documentation
     page_creation
     introduction/from_flat_php_to_symfony2
     introduction/symfony1
-    web_server/index
     web_services/index
-    workflow/index
-    composer/installation
 
 Quick Tour
 ----------
@@ -82,6 +79,7 @@ Advanced Topics
     profiler
     request
     session
+    set_up
 
 Best Practices
 --------------
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/installation>`
+a new project to test its features. First, :doc:`install the Composer </set_up/composer>`
 package manager. Then, open a command console, enter your project's directory and
 execute the following command:
 
@@ -56,7 +56,7 @@ If you prefer to test a Symfony beta version, replace the ``"2.7.*@dev"`` constr
 by ``"2.7.0-beta1"`` to install a specific beta number or ``2.7.*@beta`` to get
 the most recent beta version.
 
-After upgrading the Symfony version, read the :doc:`Symfony Upgrading Guide </upgrade/index>`
+After upgrading the Symfony version, read the :ref:`Symfony Upgrading Guide <upgrade-major-symfony-deprecations>`
 to learn how you should proceed to update your application's code in case the new
 Symfony version has deprecated some of its features.
 
diff --git a/service_container/expression_language.rst b/service_container/expression_language.rst
@@ -15,7 +15,7 @@ which has a ``getMailerMethod()`` method on it, which will return a string
 like ``sendmail`` based on some configuration. Remember that the first argument
 to the ``my_mailer`` service is the simple string ``sendmail``:
 
-.. include:: /_includes/service_container/_service_container_my_mailer.rst.inc
+.. include:: /_includes/service_container/_my_mailer.rst.inc
 
 But instead of hardcoding this, how could we get this value from the ``getMailerMethod()``
 of the new ``mailer_configuration`` service? One way is to use an expression:
diff --git a/set_up/new_project_svn.rst b/set_up/new_project_svn.rst
@@ -9,7 +9,7 @@ How to Create and Store a Symfony Project in Subversion
 .. tip::
 
     This entry is specifically about Subversion, and based on principles found
-    in :doc:`/setup/new_project_git`.
+    in :doc:`/set_up/new_project_git`.
 
 Once you've read through :doc:`/page_creation` and become familiar with
 using Symfony, you'll no-doubt be ready to start your own project. The
