Merge remote-tracking branch 'core/master' into schema-alteration

Conflicts:
	django/db/models/loading.py
	django/db/models/options.py

3 files changed, 26 insertions, 5 deletions

diff --git a/docs/internals/contributing/writing-code/submitting-patches.txt b/docs/internals/contributing/writing-code/submitting-patches.txt
index b51ac0d906..a90dc32605 100644
--- a/docs/internals/contributing/writing-code/submitting-patches.txt
+++ b/docs/internals/contributing/writing-code/submitting-patches.txt
@@ -52,8 +52,15 @@ and time availability), claim it by following these steps:
      page,
   2. then click "Submit changes."
 
+.. note::
+    The Django software foundation requests that anyone contributing more than
+    a trivial patch to Django sign and submit a `Contributor License
+    Agreement`_, this ensures that the Django Software Foundation has clear
+    license to all contributions allowing for a clear license for all users.
+
 .. _Create an account: https://www.djangoproject.com/accounts/register/
 .. _password reset page: https://www.djangoproject.com/accounts/password/reset/
+.. _Contributor License Agreement: https://www.djangoproject.com/foundation/cla/
 
 Ticket claimers' responsibility
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt
index a828b06b36..4e702ff83e 100644
--- a/docs/internals/contributing/writing-code/unit-tests.txt
+++ b/docs/internals/contributing/writing-code/unit-tests.txt
@@ -9,7 +9,8 @@ The tests cover:
 
 * Models and the database API (``tests/modeltests``),
 * Everything else in core Django code (``tests/regressiontests``),
-* :ref:`contrib-apps` (``django/contrib/<app>/tests``).
+* :ref:`contrib-apps` (``django/contrib/<app>/tests`` or
+  ``tests/regressiontests/<app>_...``).
 
 We appreciate any and all contributions to the test suite!
 
@@ -38,6 +39,8 @@ with this sample ``settings`` module, ``cd`` into the Django
 If you get an ``ImportError: No module named django.contrib`` error,
 you need to add your install of Django to your ``PYTHONPATH``.
 
+.. _running-unit-tests-settings:
+
 Using another ``settings`` module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -133,6 +136,8 @@ Then, run the tests normally, for example:
 
     ./runtests.py --settings=test_sqlite admin_inlines
 
+.. _running-unit-tests-dependencies:
+
 Running all the tests
 ~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 10bbfe1a91..414da30ff8 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -140,6 +140,11 @@ these changes.
   removed.  In its place use
   :class:`~django.contrib.staticfiles.handlers.StaticFilesHandler`.
 
+* The template tags library ``adminmedia`` and the template tag ``{%
+  admin_media_prefix %}`` will be removed in favor of the generic static files
+  handling. (This is faster than the usual deprecation path; see the
+  :doc:`Django 1.4 release notes</releases/1.4>`.)
+
 * The :ttag:`url` and :ttag:`ssi` template tags will be
   modified so that the first argument to each tag is a template variable, not
   an implied string. In 1.4, this behavior is provided by a version of the tag
@@ -232,10 +237,6 @@ these changes.
   :setting:`LOGGING` setting should include this filter explicitly if
   it is desired.
 
-* The template tag
-  :func:`django.contrib.admin.templatetags.adminmedia.admin_media_prefix`
-  will be removed in favor of the generic static files handling.
-
 * The builtin truncation functions :func:`django.utils.text.truncate_words`
   and :func:`django.utils.text.truncate_html_words` will be removed in
   favor of the ``django.utils.text.Truncator`` class.
@@ -293,6 +294,14 @@ these changes.
 * The ``AUTH_PROFILE_MODULE`` setting, and the ``get_profile()`` method on
   the User model, will be removed.
 
+* The ``cleanup`` management command will be removed. It's replaced by
+  ``clearsessions``.
+
+* The ``daily_cleanup.py`` script will be removed.
+
+* The ``depth`` keyword argument will be removed from
+  :meth:`~django.db.models.query.QuerySet.select_related`.
+
 2.0
 ---