Permalink
Browse files

more 2.4 upgrade re-arranging

  • Loading branch information...
evildmp committed Nov 19, 2012
1 parent 4dbff60 commit 397f636000ba79d7c2c5e5dbd4e69d3d96caec13
Showing with 69 additions and 53 deletions.
  1. +3 −4 docs/index.rst
  2. +66 −49 docs/upgrade/2.4.rst
View
@@ -14,10 +14,9 @@ Install
*******
.. warning::
- In version 2.4 migrations have been completely rewritten to fix issues
- with newer south releases.
- If upgrading from prior 2.3.2 releases, please refer to
- :ref:`migrations-upgrade`
+ Version 2.4 introduces some significant changes that **require** action if
+ you are upgrading from a previous version. Please refer to
+ :ref:`Upgrading from previous versions <upgrade-to-2.4>`
.. toctree::
View
@@ -6,6 +6,72 @@
What's new in 2.4
*****************
+.. _upgrade-to-2.4:
+
+.. warning:: Upgrading from previous versions
+
+ 2.4 introduces some changes that **require** action if you are upgrading
+ from a previous version.
+
+ You will need to read the sections :ref:`migrations-upgrade` and
+ :ref:`cms-moderator-upgrade` below.
+
+
+.. _migrations-upgrade:
+
+Migrations overhaul
+===================
+In version 2.4 migrations have been completely rewritten to address issues with
+newer South releases.
+
+To ease the upgrading process, all the migrations for the `cms` application have
+been consolidated into a single migration file, `0001_initial.py`.
+
+* the migrations 0002 to 0036 inclusive still exist, but are now all *dummy*
+ migrations
+
+* migrations 0037 and later are *new* migrations
+
+How this affects you
+--------------------
+
+If you're starting with *a new installation*, you don't need to worry about
+this. Don't even bother reading this section; it's for upgraders.
+
+If you're using version *2.3.2 or newer*, you don't need to worry about this
+either.
+
+If you're using version *2.3.1 or older*, you will need to run a two-step
+process.
+
+First, you'll need to upgrade to 2.3.3, to bring your migration history
+up-to-date with the new scheme. Then you'll need to perform the migrations for
+2.4.
+
+For the two-step upgrade process do the following in your project main directory
+::
+
+ pip install django-cms==2.3.3
+ python manage.py syncdb
+ python manage.py migrate
+ pip install django-cms==2.4
+ python manage.py migrate
+
+
+.. _cms-moderator-upgrade:
+
+
+CMS_MODERATOR
+=============
+Has been removed since it is no longer in use. From 2.4 onwards, all pages
+exist in a public and draft version. Users with the ``publish_page`` permission
+can publish changes to the public site.
+
+.. admonition:: Management command required
+
+ To bring a previous version of your site's database up-to-date, you'll need
+ to run ``manage.py moderator on``.
+
Removed the MultilingualMiddleware
==================================
@@ -122,60 +188,11 @@ The following settings are not needed any more and have been removed:
Please remove them from your settings.py
-
-.. _migrations-upgrade:
-
-Migrations overhaul
-===================
-In version 2.4 migrations have been completely rewritten to address issues with
-newer South releases.
-
-To ease the upgrading process, all the migrations for the `cms` application have
-been consolidated into a single migration file, `0001_initial.py`.
-
-* the migrations 0002 to 0036 inclusive still exist, but are now all *dummy*
- migrations
-
-* migrations 0037 and later are *new* migrations
-
-How this affects you
---------------------
-
-If you're starting with *a new installation*, you don't need to worry about
-this. Don't even bother reading this section; it's for upgraders.
-
-If you're using version *2.3.2 or newer*, you don't need to worry about this
-either.
-
-If you're using version *2.3.1 or older*, you will need to run a two-step
-process.
-
-First, you'll need to upgrade to 2.3.3, to bring your migration history
-up-to-date with the new scheme. Then you'll need to perform the migrations for
-2.4.
-
-For the two-step upgrade process do the following in your project main directory
-::
-
- pip install django-cms==2.3.3
- python manage.py syncdb
- python manage.py migrate
- pip install django-cms==2.4
-
-
CMS_FLAT_URLS
=============
Was marked deprecated in 2.3 and has now been removed.
-CMS_MODERATOR
-=============
-Has been removed since it is no longer in use. From 2.4 onwards, all pages
-exist in a public and draft version. Users with the ``publish_page`` permission
-can publish changes to the public site.
-
-To ensure that a site that was set up using a previous version is up to date,
-run ``manage.py moderator on``.
Plugins in Plugins

0 comments on commit 397f636

Please sign in to comment.