The no-brainer topic merges/removal

symfony · Jul 13, 2016 · 8320bad · 8320bad
1 parent 6d7e324
commit 8320bad
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 29 deletions.
diff --git a/upgrade/_update_all_packages.rst.inc → install/_update_all_packages.rst.inc b/upgrade/_update_all_packages.rst.inc → install/_update_all_packages.rst.inc
diff --git a/upgrade/_update_dep_errors.rst.inc → install/_update_dep_errors.rst.inc b/upgrade/_update_dep_errors.rst.inc → install/_update_dep_errors.rst.inc
diff --git a/upgrade/bundles.rst → install/bundles.rst b/upgrade/bundles.rst → install/bundles.rst
diff --git a/upgrade/index.rst → install/index.rst b/upgrade/index.rst → install/index.rst
@@ -1,8 +1,5 @@
-.. index::
-    single: Upgrading
-
-Upgrading
-=========
+Install and Upgrade
+===================
 
 So a new Symfony release has come out and you want to upgrade, great! Fortunately,
 because Symfony protects backwards-compatibility very closely, this *should*
@@ -13,7 +10,7 @@ There are three types of upgrades, all needing a little different preparation:
 .. toctree::
     :maxdepth: 2
 
-    /upgrade/patch_version
-    /upgrade/minor_version
-    /upgrade/major_version
-    /upgrade/bundles
+    /cookbook/upgrade/patch_version
+    /cookbook/upgrade/minor_version
+    /cookbook/upgrade/major_version
+    /cookbook/upgrade/bundles
diff --git a/upgrade/major_version.rst → install/upgrade_major.rst b/upgrade/major_version.rst → install/upgrade_major.rst
diff --git a/upgrade/minor_version.rst → install/upgrade_minor.rst b/upgrade/minor_version.rst → install/upgrade_minor.rst
diff --git a/upgrade/patch_version.rst → install/upgrade_patch.rst b/upgrade/patch_version.rst → install/upgrade_patch.rst
diff --git a/propel/propel.rst b/propel/propel.rst
diff --git a/psr/psr7.rst → request/psr7.rst b/psr/psr7.rst → request/psr7.rst
@@ -64,7 +64,8 @@ On the other hand, the bridge provide a factory interface called
 :class:`Symfony\\Bridge\\PsrHttpMessage\\HttpFoundationFactoryInterface`
 that builds HttpFoundation objects from objects implementing PSR-7 interfaces.
 
-The next snippet explain how to convert an object implementing the :class:`Psr\\Http\\Message\\ServerRequestInterface`
+The next snippet explain how to convert an object implementing the
+:class:`Psr\\Http\\Message\\ServerRequestInterface`
 interface to a :class:`Symfony\\Component\\HttpFoundation\\Request` instance::
 
     use Symfony\Bridge\PsrHttpMessage\Factory\HttpFoundationFactory;