From 38af4a6654cc9d1b32cb786ae36796ac6a3dae6e Mon Sep 17 00:00:00 2001
From: Ryan Weaver <ryan@thatsquality.com>
Date: Thu, 14 Jul 2016 14:32:06 -0400
Subject: [PATCH] Merging setup and install directories

---
 _build/redirection_map                          | 7 ++++++-
 setup.rst                                       | 6 +++++-
 {install => setup}/_update_all_packages.rst.inc | 0
 {install => setup}/_update_dep_errors.rst.inc   | 0
 {install => setup}/bundles.rst                  | 0
 {install => setup}/unstable_versions.rst        | 0
 {install => setup}/upgrade_major.rst            | 4 ++--
 {install => setup}/upgrade_minor.rst            | 4 ++--
 {install => setup}/upgrade_patch.rst            | 0
 9 files changed, 15 insertions(+), 6 deletions(-)
 rename {install => setup}/_update_all_packages.rst.inc (100%)
 rename {install => setup}/_update_dep_errors.rst.inc (100%)
 rename {install => setup}/bundles.rst (100%)
 rename {install => setup}/unstable_versions.rst (100%)
 rename {install => setup}/upgrade_major.rst (98%)
 rename {install => setup}/upgrade_minor.rst (95%)
 rename {install => setup}/upgrade_patch.rst (100%)

diff --git a/_build/redirection_map b/_build/redirection_map
index 8c1bb17df16..ae8881f4254 100644
--- a/_build/redirection_map
+++ b/_build/redirection_map
@@ -151,7 +151,11 @@
 /cookbook/form/unit_testing /form/unit_testing
 /cookbook/form/use_empty_data /form/use_empty_data
 /cookbook/frontend/bower /frontend/bower
-/cookbook/install/unstable_versions /install/unstable_versions
+/cookbook/install/unstable_versions /setup/unstable_versions
+/cookbook/install/bundles /setup/bundles
+/cookbook/install/upgrade_major /setup/upgrade_major
+/cookbook/install/upgrade_minor /setup/upgrade_minor
+/cookbook/install/upgrade_patch /setup/upgrade_patch
 /cookbook/logging/channels_handlers /logging/channels_handlers
 /cookbook/logging/monolog /logging
 /cookbook/logging/monolog_console /logging/monolog_console
@@ -278,3 +282,4 @@
 /components/var_dumper/index /components/var_dumper
 /components/yaml/introduction /components/yaml
 /components/yaml/index /components/yaml
+/install/bundles setup/bundles
diff --git a/setup.rst b/setup.rst
index a00454d1df0..1b7daacd354 100644
--- a/setup.rst
+++ b/setup.rst
@@ -355,7 +355,11 @@ Learn More
     :maxdepth: 1
     :glob:
 
-    install/*
+    setup/homestead
+    setup/new_project_git
+    setup/built_in_web_server
+    setup/web_server_configuration
+    setup/composer
     setup/*
 
 .. _`Composer`: https://getcomposer.org/
diff --git a/install/_update_all_packages.rst.inc b/setup/_update_all_packages.rst.inc
similarity index 100%
rename from install/_update_all_packages.rst.inc
rename to setup/_update_all_packages.rst.inc
diff --git a/install/_update_dep_errors.rst.inc b/setup/_update_dep_errors.rst.inc
similarity index 100%
rename from install/_update_dep_errors.rst.inc
rename to setup/_update_dep_errors.rst.inc
diff --git a/install/bundles.rst b/setup/bundles.rst
similarity index 100%
rename from install/bundles.rst
rename to setup/bundles.rst
diff --git a/install/unstable_versions.rst b/setup/unstable_versions.rst
similarity index 100%
rename from install/unstable_versions.rst
rename to setup/unstable_versions.rst
diff --git a/install/upgrade_major.rst b/setup/upgrade_major.rst
similarity index 98%
rename from install/upgrade_major.rst
rename to setup/upgrade_major.rst
index b0e55257a85..e0113b27746 100644
--- a/install/upgrade_major.rst
+++ b/setup/upgrade_major.rst
@@ -136,9 +136,9 @@ Next, use Composer to download new versions of the libraries:
 
     $ composer update symfony/symfony
 
-.. include:: /install/_update_dep_errors.rst.inc
+.. include:: /setup/_update_dep_errors.rst.inc
 
-.. include:: /install/_update_all_packages.rst.inc
+.. include:: /setup/_update_all_packages.rst.inc
 
 .. _upgrade-major-symfony-after:
 
diff --git a/install/upgrade_minor.rst b/setup/upgrade_minor.rst
similarity index 95%
rename from install/upgrade_minor.rst
rename to setup/upgrade_minor.rst
index c58cca237ea..1886baadf60 100644
--- a/install/upgrade_minor.rst
+++ b/setup/upgrade_minor.rst
@@ -41,9 +41,9 @@ Next, use Composer to download new versions of the libraries:
 
     $ composer update symfony/symfony
 
-.. include:: /install/_update_dep_errors.rst.inc
+.. include:: /setup/_update_dep_errors.rst.inc
 
-.. include:: /install/_update_all_packages.rst.inc
+.. include:: /setup/_update_all_packages.rst.inc
 
 .. _`upgrade-minor-symfony-code`:
 
diff --git a/install/upgrade_patch.rst b/setup/upgrade_patch.rst
similarity index 100%
rename from install/upgrade_patch.rst
rename to setup/upgrade_patch.rst