symfony
diff --git a/‎configuration/web_server_configuration.rst
+1-1 b/‎configuration/web_server_configuration.rst
+1-1
diff --git a/‎contributing/code/tests.rst
+1-1 b/‎contributing/code/tests.rst
+1-1
diff --git a/‎controller.rst
+1-1 b/‎controller.rst
+1-1
diff --git a/‎create_framework/introduction.rst
+1-1 b/‎create_framework/introduction.rst
+1-1
diff --git a/‎installation.rst
+1-1 b/‎installation.rst
+1-1
diff --git a/‎redirection_map
+5-5 b/‎redirection_map
+5-5
diff --git a/‎set_up.rst
+7 b/‎set_up.rst
+7
diff --git a/‎workflow/_vendor_deps.rst.inc renamed to ‎set_up/_vendor_deps.rst.inc b/‎workflow/_vendor_deps.rst.inc renamed to ‎set_up/_vendor_deps.rst.inc
diff --git a/‎web_server/built_in.rst renamed to ‎set_up/built_in_web_server.rst b/‎web_server/built_in.rst renamed to ‎set_up/built_in_web_server.rst
diff --git a/‎composer/installation.rst renamed to ‎set_up/composer.rst b/‎composer/installation.rst renamed to ‎set_up/composer.rst
diff --git a/‎workflow/homestead.rst renamed to ‎set_up/homestead.rst b/‎workflow/homestead.rst renamed to ‎set_up/homestead.rst
diff --git a/‎workflow/new_project_git.rst renamed to ‎set_up/new_project_git.rst
+1-1 b/‎workflow/new_project_git.rst renamed to ‎set_up/new_project_git.rst
+1-1
diff --git a/‎workflow/new_project_svn.rst renamed to ‎set_up/new_project_svn.rst
+2-2 b/‎workflow/new_project_svn.rst renamed to ‎set_up/new_project_svn.rst
+2-2
diff --git a/‎web_server/index.rst
-7 b/‎web_server/index.rst
-7
diff --git a/‎workflow/index.rst
-9 b/‎workflow/index.rst
-9
@@ -5,7 +5,7 @@ Configuring a Web Server
 ========================
 
 The preferred way to develop your Symfony application is to use
-:doc:`PHP's internal web server </web_server/built_in>`. However,
+:doc:`PHP's internal web server </set_up/built_in_web_server>`. However,
 when using an older PHP version or when running the application in the production
 environment, you'll need to use a fully-featured web server. This article
 describes several ways to use Symfony with Apache or Nginx.
 
@@ -18,7 +18,7 @@ Before Running the Tests
 
 To run the Symfony test suite, install the external dependencies used during the
 tests, such as Doctrine, Twig and Monolog. To do so,
-:doc:`install Composer </composer/installation>` and execute the following:
+:doc:`install Composer </set_up/composer>` and execute the following:
 
 .. code-block:: bash
 
 
@@ -212,7 +212,7 @@ to the controller:
         return $collection;
 
 Now, you can go to ``/hello/ryan`` (e.g. ``http://localhost:8000/hello/ryan``
-if you're using the :doc:`built-in web server </web_server/built_in>`)
+if you're using the :doc:`built-in web server </set_up/built_in_web_server>`)
 and Symfony will execute the ``HelloController::indexAction()`` controller
 and pass in ``ryan`` for the ``$name`` variable. Creating a "page" means
 simply creating a controller method and an associated route.
 
@@ -94,7 +94,7 @@ Dependency Management
 
 To install the Symfony Components that you need for your framework, you are going
 to use `Composer`_, a project dependency manager for PHP. If you don't have it
-yet, :doc:`download and install Composer </composer/installation>` now.
+yet, :doc:`download and install Composer </set_up/composer>` now.
 
 Our Project
 -----------
 
@@ -100,7 +100,7 @@ can create Symfony applications with `Composer`_, the dependency manager used by
 modern PHP applications.
 
 If you don't have Composer installed in your computer, start by
-:doc:`installing Composer globally </composer/installation>`. Then, execute the
+:doc:`installing Composer globally </set_up/composer>`. Then, execute the
 ``create-project`` command to create a new Symfony application based on its
 latest stable version:
 
 
@@ -90,7 +90,7 @@
 /cookbook/bundles/remove /bundles/remove
 /cookbook/cache/form_csrf_caching
 /cookbook/cache/varnish
-/cookbook/composer /composer/installation
+/cookbook/composer /set_up/composer
 /cookbook/configuration/apache_router /configuration/apache_router
 /cookbook/configuration/configuration_organization /configuration/configuration_organization
 /cookbook/configuration/environments /configuration/environments
@@ -229,11 +229,11 @@
 /cookbook/validation/custom_constraint /validation/custom_constraint
 /cookbook/validation/group_service_resolver /validation/group_service_resolver
 /cookbook/validation/severity /validation/severity
-/cookbook/web_server/built_in /web_server/built_in
+/cookbook/web_server/built_in /set_up/built_in_web_server
 /cookbook/web_services/php_soap_extension /web_services/php_soap_extension
-/cookbook/workflow/homestead /workflow/homestead
-/cookbook/workflow/new_project_git /workflow/new_project_git
-/cookbook/workflow/new_project_svn /workflow/new_project_svn
+/cookbook/workflow/homestead /set_up/homestead
+/cookbook/workflow/new_project_git /set_up/new_project_git
+/cookbook/workflow/new_project_svn /set_up/new_project_svn
 /components/asset/index /components/asset
 /components/asset/introduction /components/asset
 /components/browser_kit/index /components/browser_kit
 
@@ -0,0 +1,7 @@
+Set Up
+======
+
+.. toctree::
+    :glob:
+
+    set_up/*
@@ -1,5 +1,5 @@
 .. index::
-   single: Workflow; Git
+   single: Set Up; Git
 
 .. _how-to-create-and-store-a-symfony2-project-in-git:
 
 
@@ -1,5 +1,5 @@
 .. index::
-   single: Workflow; Subversion
+   single: Set Up; Subversion
 
 .. _how-to-create-and-store-a-symfony2-project-in-subversion:
 
@@ -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:`/workflow/new_project_git`.
+    in :doc:`/setup/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