Merge branch 'master' of github.com:django/django into schema-alteration

Conflicts:
	django/db/backends/postgresql_psycopg2/base.py

5 files changed, 38 insertions, 16 deletions

diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index 972e506155..fb601a24c0 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -146,7 +146,7 @@ Joseph Kocherhans
 
     Brian lives in Denver, Colorado, USA.
 
-.. _brian rosner: http://oebfare.com/
+.. _brian rosner: http://brosner.com/
 .. _eldarion: http://eldarion.com/
 .. _django dose: http://djangodose.com/
 
@@ -162,7 +162,7 @@ Joseph Kocherhans
 
     Gary lives in Austin, Texas, USA.
 
-.. _Gary Wilson: http://gdub.wordpress.com/
+.. _Gary Wilson: http://thegarywilson.com/
 .. _The University of Texas: http://www.utexas.edu/
 
 Justin Bronn
@@ -191,14 +191,19 @@ Karen Tracey
 `Jannis Leidel`_
     Jannis graduated in media design from `Bauhaus-University Weimar`_,
     is the author of a number of pluggable Django apps and likes to
-    contribute to Open Source projects like Pinax_. He currently works as
-    a freelance Web developer and designer.
+    contribute to Open Source projects like virtualenv_ and pip_.
+
+    He has worked on Django's auth, admin and staticfiles apps as well as
+    the form, core, internationalization and test systems. He currently works
+    as the lead engineer at Gidsy_.
 
     Jannis lives in Berlin, Germany.
 
 .. _Jannis Leidel: http://jezdez.com/
 .. _Bauhaus-University Weimar: http://www.uni-weimar.de/
-.. _pinax: http://pinaxproject.com/
+.. _virtualenv: http://www.virtualenv.org/
+.. _pip: http://www.pip-installer.org/
+.. _Gidsy: http://gidsy.com/
 
 `James Tauber`_
     James is the lead developer of Pinax_ and the CEO and founder of
@@ -214,15 +219,15 @@ Karen Tracey
 .. _James Tauber: http://jtauber.com/
 
 `Alex Gaynor`_
-    Alex is a student at Rensselaer Polytechnic Institute, and is also an
-    independent contractor.  He found Django in 2007 and has been addicted ever
-    since he found out you don't need to write out your forms by hand.  He has
-    a small obsession with compilers.  He's contributed to the ORM, forms,
-    admin, and other components of Django.
+    Alex is a software engineer working at Rdio_. He found Django in 2007 and
+    has been addicted ever since he found out you don't need to write out your
+    forms by hand. He has a small obsession with compilers.  He's contributed
+    to the ORM, forms, admin, and other components of Django.
 
-    Alex lives in Chicago, IL, but spends most of his time in Troy, NY.
+    Alex lives in San Francisco, CA, USA.
 
 .. _Alex Gaynor: http://alexgaynor.net
+.. _Rdio: http://rdio.com
 
 `Andrew Godwin`_
     Andrew is a freelance Python developer and tinkerer, and has been
@@ -365,6 +370,16 @@ Anssi Kääriäinen
     all related features. He's also a fan of benckmarking and he tries keep
     Django as fast as possible.
 
+Florian Apolloner
+    Florian is currently studying Physics at the `Graz University of Technology`_.
+    Soon after he started using Django he joined the `Ubuntuusers webteam`_ to
+    work on *Inyoka*, the software powering the whole Ubuntusers site.
+
+    For the time beeing he lives in Graz, Austria (not Australia ;)).
+
+.. _Graz University of Technology: http://tugraz.at/
+.. _Ubuntuusers webteam: http://wiki.ubuntuusers.de/ubuntuusers/Webteam
+
 Specialists
 -----------
 
diff --git a/docs/internals/contributing/localizing.txt b/docs/internals/contributing/localizing.txt
index ff957c44a4..263087b5fa 100644
--- a/docs/internals/contributing/localizing.txt
+++ b/docs/internals/contributing/localizing.txt
@@ -60,7 +60,7 @@ Django source tree, as for any code change:
 * Open a ticket in Django's ticket system, set its ``Component`` field to
   ``Translations``, and attach the patch to it.
 
-.. _Transifex: https://www.transifex.net/
+.. _Transifex: https://www.transifex.com/
 .. _Django i18n mailing list: http://groups.google.com/group/django-i18n/
-.. _Django project page: https://www.transifex.net/projects/p/django/
-.. _Transifex User Guide: http://help.transifex.net/
+.. _Django project page: https://www.transifex.com/projects/p/django/
+.. _Transifex User Guide: http://help.transifex.com/
diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt
index 9d6e76e453..4de506a654 100644
--- a/docs/internals/contributing/writing-code/unit-tests.txt
+++ b/docs/internals/contributing/writing-code/unit-tests.txt
@@ -159,7 +159,7 @@ associated tests will be skipped.
 .. _Textile: http://pypi.python.org/pypi/textile
 .. _docutils: http://pypi.python.org/pypi/docutils/0.4
 .. _setuptools: http://pypi.python.org/pypi/setuptools/
-.. _memcached: http://www.danga.com/memcached/
+.. _memcached: http://memcached.org/
 .. _gettext: http://www.gnu.org/software/gettext/manual/gettext.html
 .. _selenium: http://pypi.python.org/pypi/selenium
 
diff --git a/docs/internals/contributing/writing-documentation.txt b/docs/internals/contributing/writing-documentation.txt
index e91d1291e9..c8d7039a68 100644
--- a/docs/internals/contributing/writing-documentation.txt
+++ b/docs/internals/contributing/writing-documentation.txt
@@ -22,7 +22,7 @@ Getting the raw documentation
 -----------------------------
 
 Though Django's documentation is intended to be read as HTML at
-http://docs.djangoproject.com/, we edit it as a collection of text files for
+https://docs.djangoproject.com/, we edit it as a collection of text files for
 maximum flexibility. These files live in the top-level ``docs/`` directory of a
 Django release.
 
diff --git a/docs/internals/deprecation.txt b/docs/internals/deprecation.txt
index 342ef5266a..9359c82e46 100644
--- a/docs/internals/deprecation.txt
+++ b/docs/internals/deprecation.txt
@@ -276,6 +276,13 @@ these changes.
 * The function ``django.utils.itercompat.product`` will be removed. The Python
   builtin version should be used instead.
 
+* Auto-correction of INSTALLED_APPS and TEMPLATE_DIRS settings when they are
+  specified as a plain string instead of a tuple will be removed and raise an
+  exception.
+
+* The ``mimetype`` argument to :class:`~django.http.HttpResponse` ``__init__``
+  will be removed (``content_type`` should be used instead).
+
 2.0
 ---