diff --git a/cookbook/upgrade/_update_all_packages.rst.inc b/cookbook/upgrade/_update_all_packages.rst.inc index b309e054327..95e1c63f954 100644 --- a/cookbook/upgrade/_update_all_packages.rst.inc +++ b/cookbook/upgrade/_update_all_packages.rst.inc @@ -8,7 +8,7 @@ this safely by running: .. caution:: - Beware, if you have some bad `version constraints`_ in your + Beware, if you have some unspecific `version constraints`_ in your ``composer.json`` (e.g. ``dev-master``), this could upgrade some non-Symfony libraries to new versions that contain backwards-compatibility breaking changes. diff --git a/cookbook/upgrade/major_version.rst b/cookbook/upgrade/major_version.rst index 6428c20159f..67dc641d14f 100644 --- a/cookbook/upgrade/major_version.rst +++ b/cookbook/upgrade/major_version.rst @@ -31,10 +31,12 @@ old API will still work, while the new feature is used internally. This BC layer is then marked as *deprecated*, indicating that it will be removed/changed in the future. -The major version is the only time all existing BC layers are removed. The last -minor version before a new major version (i.e. 2.7 is the last minor version of -the 2 releases, 3.0 is the next version) will trigger deprecation notices when a -BC layer is used. +The major version is the only time all existing BC layers are removed. However, +if you make sure you've fixed all deprecated usages in the last version of the +previous major version, you should be able to upgrade to the new major version +without problems. To help you with this, the last minor releases will trigger +deprecated notices. For example, 2.7 and 2.8 trigger deprecated notices and if +you do not have any notice while using 2.8, you can savely upgrade to 3.0. When visiting your application in the :doc:`dev environment ` in your browser, diff --git a/cookbook/upgrade/minor_version.rst b/cookbook/upgrade/minor_version.rst index 4a5a0fa023e..3fa2d58970a 100644 --- a/cookbook/upgrade/minor_version.rst +++ b/cookbook/upgrade/minor_version.rst @@ -45,7 +45,7 @@ Next, use Composer to download new versions of the libraries: .. _`upgrade-minor-symfony-code`: -2) Updating Your Code to Work with the new Version +2) Updating your Code to Work with the new Version -------------------------------------------------- In theory, you should be done! However, you *may* need to make a few changes