minor #81 Merging setup and install directories (weaverryan)

This PR was squashed before being merged into the 2.7 branch (closes #81).

Discussion
----------

Merging setup and install directories

We were linking to both of these directories from `setup.rst`, so I merged them. It's still a mixture of upgrading & installing... but maybe we can worry about that later.

Will fix #65

Commits
-------

38af4a6 Merging setup and install directories

_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
@@ -287,3 +291,4 @@
 /components/var_dumper/index /components/var_dumper
 /components/yaml/introduction /components/yaml
 /components/yaml/index /components/yaml
+/install/bundles setup/bundles

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/

install/upgrade_major.rst → 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:
 

install/upgrade_minor.rst → 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`: