Merge branch 'master' into schema-alteration

Conflicts:
	django/db/backends/__init__.py
	django/db/models/fields/related.py
	django/db/models/options.py

8 files changed, 60 insertions, 21 deletions

diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index ca56d36880..7900dd8cd0 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -407,6 +407,18 @@ Jeremy Dunck
 .. _vlogger: http://youtube.com/bryanveloso/
 .. _shoutcaster: http://twitch.tv/vlogalonstar/
 
+`Preston Holmes`_
+    Preston is a recovering neuroscientist who originally discovered Django as
+    part of a sweeping move to Python from a grab bag of half a dozen
+    languages. He was drawn to Django's balance of practical batteries included
+    philosophy, care and thought in code design, and strong open source
+    community. In addition to his current job in private progressive education,
+    Preston contributes some developer time to local non-profits.
+
+    Preston lives with his family and animal menagerie in Santa Barbara, CA, USA.
+
+.. _Preston Holmes: http://www.ptone.com/
+
 Specialists
 -----------
 
diff --git a/docs/internals/contributing/committing-code.txt b/docs/internals/contributing/committing-code.txt
index d36bc78fe1..67dda02f8b 100644
--- a/docs/internals/contributing/committing-code.txt
+++ b/docs/internals/contributing/committing-code.txt
@@ -187,7 +187,15 @@ Django's Git repository:
 
   For the curious, we're using a `Trac plugin`_ for this.
 
-  .. _Trac plugin: https://github.com/aaugustin/trac-github
+.. note::
+
+    Note that the Trac integration doesn't know anything about pull requests.
+    So if you try to close a pull request with the phrase "closes #400" in your
+    commit message, GitHub will close the pull request, but the Trac plugin
+    will also close the same numbered ticket in Trac.
+
+
+.. _Trac plugin: https://github.com/aaugustin/trac-github
 
 * If your commit references a ticket in the Django `ticket tracker`_ but
   does *not* close the ticket, include the phrase "Refs #xxxxx", where "xxxxx"
diff --git a/docs/internals/contributing/localizing.txt b/docs/internals/contributing/localizing.txt
index 263087b5fa..0cde77882c 100644
--- a/docs/internals/contributing/localizing.txt
+++ b/docs/internals/contributing/localizing.txt
@@ -55,7 +55,7 @@ The format files aren't managed by the use of Transifex. To change them, you
 must :doc:`create a patch<writing-code/submitting-patches>` against the
 Django source tree, as for any code change:
 
-* Create a diff against the current Subversion trunk.
+* Create a diff against the current Git master branch.
 
 * Open a ticket in Django's ticket system, set its ``Component`` field to
   ``Translations``, and attach the patch to it.
diff --git a/docs/internals/contributing/triaging-tickets.txt b/docs/internals/contributing/triaging-tickets.txt
index ab879e5caf..84f70fd731 100644
--- a/docs/internals/contributing/triaging-tickets.txt
+++ b/docs/internals/contributing/triaging-tickets.txt
@@ -171,15 +171,6 @@ concrete actionable issues. They are enhancement requests that we might
 consider adding someday to the framework if an excellent patch is submitted.
 These tickets are not a high priority.
 
-Fixed on a branch
-~~~~~~~~~~~~~~~~~
-
-Used to indicate that a ticket is resolved as part of a major body of work
-that will eventually be merged to trunk. Tickets in this stage generally
-don't need further work. This may happen in the case of major
-features/refactors in each release cycle, or as part of the annual Google
-Summer of Code efforts.
-
 Other triage attributes
 -----------------------
 
diff --git a/docs/internals/contributing/writing-code/coding-style.txt b/docs/internals/contributing/writing-code/coding-style.txt
index 2fa0233e3d..a699e39bd8 100644
--- a/docs/internals/contributing/writing-code/coding-style.txt
+++ b/docs/internals/contributing/writing-code/coding-style.txt
@@ -140,9 +140,9 @@ Model style
   a tuple of tuples, with an all-uppercase name, either near the top of
   the model module or just above the model class. Example::
 
-      GENDER_CHOICES = (
-          ('M', 'Male'),
-          ('F', 'Female'),
+      DIRECTION_CHOICES = (
+          ('U', 'Up'),
+          ('D', 'Down'),
       )
 
 Use of ``django.conf.settings``
diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt
index 4de506a654..a828b06b36 100644
--- a/docs/internals/contributing/writing-code/unit-tests.txt
+++ b/docs/internals/contributing/writing-code/unit-tests.txt
@@ -163,6 +163,26 @@ associated tests will be skipped.
 .. _gettext: http://www.gnu.org/software/gettext/manual/gettext.html
 .. _selenium: http://pypi.python.org/pypi/selenium
 
+Code coverage
+~~~~~~~~~~~~~
+
+Contributors are encouraged to run coverage on the test suite to identify areas
+that need additional tests. The coverage tool installation and use is described
+in :ref:`testing code coverage<topics-testing-code-coverage>`.
+
+To run coverage on the Django test suite using the standard test settings::
+
+    coverage run ./runtests.py --settings=test_sqlite
+
+After running coverage, generate the html report by running::
+
+    coverage html
+
+When running coverage for the Django tests, the included ``.coveragerc``
+settings file  defines ``coverage_html`` as the output directory for the report
+and also excludes several directories not relevant to the results
+(test code or external code included in Django).
+
 .. _contrib-apps:
 
 Contrib apps
diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt
index c8d7039a68..469f8614b9 100644
--- a/docs/internals/contributing/writing-documentation.txt
+++ b/docs/internals/contributing/writing-documentation.txt
@@ -30,8 +30,9 @@ If you'd like to start contributing to our docs, get the development version of
 Django from the source code repository
 (see :ref:`installing-development-version`). The development version has the
 latest-and-greatest documentation, just as it has latest-and-greatest code.
-Generally, we only revise documentation in the development version, as our
-policy is to freeze documentation for existing releases (see
+We also backport documentation fixes and improvements, at the discretion of the
+committer, to the last release branch. That's because it's highly advantageous
+to have the docs for the last release be up-to-date and correct (see
 :ref:`differences-between-doc-versions`).
 
 Getting started with Sphinx
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 4add751912..10bbfe1a91 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -23,7 +23,7 @@ these changes.
 * The :mod:`django.contrib.gis.db.backend` module will be removed in favor
   of the specific backends.
 
-* ``SMTPConnection`` will be removed in favor of a generic E-mail backend API.
+* ``SMTPConnection`` will be removed in favor of a generic Email backend API.
 
 * The many to many SQL generation functions on the database backends
   will be removed.
@@ -134,16 +134,16 @@ these changes.
 
 * The function-based generic view modules will be removed in favor of their
   class-based equivalents, outlined :doc:`here
-  </topics/class-based-views/index>`:
+  </topics/class-based-views/index>`.
 
 * The :class:`~django.core.servers.basehttp.AdminMediaHandler` will be
   removed.  In its place use
   :class:`~django.contrib.staticfiles.handlers.StaticFilesHandler`.
 
 * 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. Until then, the new-style
-  behavior is provided in the ``future`` template tag library.
+  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
+  in the ``future`` template tag library.
 
 * The :djadmin:`reset` and :djadmin:`sqlreset` management commands
   will be removed.
@@ -286,6 +286,13 @@ these changes.
 * The ``mimetype`` argument to :class:`~django.http.HttpResponse` ``__init__``
   will be removed (``content_type`` should be used instead).
 
+* When :class:`~django.http.HttpResponse` is instantiated with an iterator,
+  or when :attr:`~django.http.HttpResponse.content` is set to an iterator,
+  that iterator will be immediately consumed.
+
+* The ``AUTH_PROFILE_MODULE`` setting, and the ``get_profile()`` method on
+  the User model, will be removed.
+
 2.0
 ---