Merging setup and install directories

symfony · Jul 15, 2016 · 38af4a6 · 38af4a6
1 parent 3918ee8
commit 38af4a6
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 6 deletions.
diff --git 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
@@ -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 → setup/_update_all_packages.rst.inc b/install/_update_all_packages.rst.inc → setup/_update_all_packages.rst.inc
diff --git a/install/_update_dep_errors.rst.inc → setup/_update_dep_errors.rst.inc b/install/_update_dep_errors.rst.inc → setup/_update_dep_errors.rst.inc
diff --git a/install/bundles.rst → setup/bundles.rst b/install/bundles.rst → setup/bundles.rst
diff --git a/install/unstable_versions.rst → setup/unstable_versions.rst b/install/unstable_versions.rst → setup/unstable_versions.rst
diff --git a/install/upgrade_major.rst → setup/upgrade_major.rst b/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:
 

diff --git a/install/upgrade_minor.rst → setup/upgrade_minor.rst b/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`:
 

diff --git a/install/upgrade_patch.rst → setup/upgrade_patch.rst b/install/upgrade_patch.rst → setup/upgrade_patch.rst