Renaming installation.rst -> setup.rst && set_up.rst to setup.rst

weaverryan · weaverryan · commit d23d3b368c7b · 2016-07-13T13:15:51.000-04:00
diff --git a/best_practices/creating-the-project.rst b/best_practices/creating-the-project.rst
@@ -12,7 +12,7 @@ Installer**, which has to be installed before creating your first project.
 
     Use the Symfony Installer to create new Symfony-based projects.
 
-Read the :doc:`installation chapter </installation>` of the Symfony Book to
+Read the :doc:`installation & setup chapter </setup>` of the Symfony Book to
 learn how to install and use the Symfony Installer.
 
 .. _linux-and-mac-os-x-systems:
diff --git a/configuration/environments.rst b/configuration/environments.rst
@@ -140,7 +140,7 @@ either the ``app.php`` (for the ``prod`` environment) or the ``app_dev.php``
 
    The given URLs assume that your web server is configured to use the ``web/``
    directory of the application as its root. Read more in
-   :doc:`Installing Symfony </installation>`.
+   :doc:`Installing Symfony </setup>`.
 
 If you open up one of these files, you'll quickly see that the environment
 used by each is explicitly set::
diff --git a/configuration/web_server_configuration.rst b/configuration/web_server_configuration.rst
@@ -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 </set_up/built_in_web_server>`. However,
+:doc:`PHP's internal web server </setup/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.
diff --git a/contributing/code/tests.rst b/contributing/code/tests.rst
@@ -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 </set_up/composer>` and execute the following:
+:doc:`install Composer </setup/composer>` and execute the following:
 
 .. code-block:: bash
 
diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst
@@ -140,8 +140,8 @@ even remove any content and do your best to comply with the
 .. code-block:: bash
 
     # if the modified content existed before
-    $ git add book/installation.rst
-    $ git commit book/installation.rst
+    $ git add setup.rst
+    $ git commit setup.rst
 
 **Step 6.** **Push** the changes to your forked repository:
 
diff --git a/controller.rst b/controller.rst
@@ -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 </set_up/built_in_web_server>`)
+if you're using the :doc:`built-in web server </setup/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.
diff --git a/create_framework/introduction.rst b/create_framework/introduction.rst
@@ -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 </set_up/composer>` now.
+yet, :doc:`download and install Composer </setup/composer>` now.
 
 Our Project
 -----------
diff --git a/index.rst b/index.rst
@@ -79,7 +79,7 @@ Advanced Topics
     profiler
     request
     session
-    set_up
+    setup
 
 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 </set_up/composer>`
+a new project to test its features. First, :doc:`install the Composer </setup/composer>`
 package manager. Then, open a command console, enter your project's directory and
 execute the following command:
 
diff --git a/page_creation.rst b/page_creation.rst
@@ -32,7 +32,7 @@ Creating a Page: Route and Controller
 
 .. tip::
 
-    Before continuing, make sure you've read the :doc:`Installation </installation>`
+    Before continuing, make sure you've read the :doc:`Setup </setup>`
     chapter and can access your new Symfony app in the browser.
 
 Suppose you want to create a page - ``/lucky/number`` - that generates a lucky (well,
diff --git a/quick_tour/the_big_picture.rst b/quick_tour/the_big_picture.rst
@@ -14,7 +14,7 @@ Installing Symfony
 ------------------
 
 Before continuing reading this chapter, make sure to have installed both PHP
-and Symfony as explained in the :doc:`installation chapter </installation>`
+and Symfony as explained in the :doc:`setup chapter </setup>`
 of the Symfony book.
 
 Understanding the Fundamentals
diff --git a/redirection_map b/redirection_map
@@ -55,7 +55,7 @@
 /create_framework/http-kernel-httpkernel-class /create_framework/http_kernel_httpkernel_class
 /create_framework/dependency-injection /create_framework/dependency_injection
 /cookbook/doctrine/file_uploads /cookbook/controller/upload_file
-/book/installation /installation
+/book/installation /setup
 /book/page_creation /page_creation
 /book/controller /controller
 /book/routing /routing
@@ -90,7 +90,7 @@
 /cookbook/bundles/remove /bundles/remove
 /cookbook/cache/form_csrf_caching
 /cookbook/cache/varnish
-/cookbook/composer /set_up/composer
+/cookbook/composer /setup/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 /set_up/built_in_web_server
+/cookbook/web_server/built_in /setup/built_in_web_server
 /cookbook/web_services/php_soap_extension /web_services/php_soap_extension
-/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
+/cookbook/workflow/homestead /setup/homestead
+/cookbook/workflow/new_project_git /setup/new_project_git
+/cookbook/workflow/new_project_svn /setup/new_project_svn
 /components/asset/index /components/asset
 /components/asset/introduction /components/asset
 /components/browser_kit/index /components/browser_kit
diff --git a/set_up.rst b/set_up.rst
diff --git a/setup.rst b/setup.rst
@@ -1,8 +1,8 @@
 .. index::
-   single: Installing and Configuring Symfony
+   single: Installing and Setting up Symfony
 
-Installing the Symfony Framework
-================================
+Installing & Setting up the Symfony Framework
+=============================================
 
 This article explains how to install Symfony in different ways and how to solve
 the most common issues that may appear during the installation process.
@@ -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 </set_up/composer>`. Then, execute the
+:doc:`installing Composer globally </setup/composer>`. Then, execute the
 ``create-project`` command to create a new Symfony application based on its
 latest stable version:
 
diff --git a/setup/_vendor_deps.rst.inc b/setup/_vendor_deps.rst.inc
diff --git a/setup/built_in_web_server.rst b/setup/built_in_web_server.rst
diff --git a/setup/composer.rst b/setup/composer.rst
diff --git a/setup/homestead.rst b/setup/homestead.rst
diff --git a/setup/new_project_git.rst b/setup/new_project_git.rst
@@ -20,7 +20,7 @@ Initial Project Setup
 ---------------------
 
 To get started, you'll need to download Symfony and get things running. See
-the :doc:`/installation` chapter for details.
+the :doc:`/setup` chapter for details.
 
 Once your project is running, just follow these simple steps:
 
diff --git a/setup/new_project_svn.rst b/setup/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:`/set_up/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
@@ -48,7 +48,7 @@ Initial Project Setup
 
 To get started, you'll need to download Symfony and get the basic Subversion setup.
 First, download and get your Symfony project running by following the
-:doc:`Installation </installation>` chapter.
+:doc:`Installation </setup>` chapter.
 
 Once you have your new project directory and things are working, follow along
 with these steps:
