Skip to content

Commit

Permalink
Applied comments
Browse files Browse the repository at this point in the history
  • Loading branch information
wouterj committed May 23, 2015
1 parent 99c5075 commit 55fcee9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cookbook/upgrade/_update_all_packages.rst.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 6 additions & 4 deletions cookbook/upgrade/major_version.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 </cookbook/configuration/environments>` in your browser,
Expand Down
2 changes: 1 addition & 1 deletion cookbook/upgrade/minor_version.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 55fcee9

Please sign in to comment.