Merge branch 'master' into schema-alteration

Conflicts:
	django/db/backends/__init__.py
	django/db/backends/mysql/base.py
	django/db/backends/oracle/base.py
	django/db/backends/oracle/creation.py
	django/db/backends/postgresql_psycopg2/base.py
	django/db/backends/sqlite3/base.py
	django/db/models/fields/related.py

4 files changed, 38 insertions, 7 deletions

diff --git a/docs/faq/admin.txt b/docs/faq/admin.txt
index 30d452cbe2..1d9a7c7427 100644
--- a/docs/faq/admin.txt
+++ b/docs/faq/admin.txt
@@ -49,7 +49,7 @@ How do I limit admin access so that objects can only be edited by the users who
 The :class:`~django.contrib.admin.ModelAdmin` class also provides customization
 hooks that allow you to control the visibility and editability of objects in the
 admin. Using the same trick of extracting the user from the request, the
-:meth:`~django.contrib.admin.ModelAdmin.queryset` and
+:meth:`~django.contrib.admin.ModelAdmin.get_queryset` and
 :meth:`~django.contrib.admin.ModelAdmin.has_change_permission` can be used to
 control the visibility and editability of objects in the admin.
 
diff --git a/docs/faq/general.txt b/docs/faq/general.txt
index dc569840d1..5db3141f82 100644
--- a/docs/faq/general.txt
+++ b/docs/faq/general.txt
@@ -188,3 +188,31 @@ If you want to find Django-capable people in your local area, try
 https://people.djangoproject.com/ .
 
 .. _developers for hire page: https://code.djangoproject.com/wiki/DevelopersForHire
+
+How do I cite Django?
+---------------------
+
+It's difficult to give an official citation format, for two reasons: citation
+formats can vary wildly between publications, and citation standards for
+software are still a matter of some debate.
+
+For example, `APA style`_,  would dictate something like::
+
+    Django (Version 1.5) [Computer Software]. (2013). Retrieved from http://djangoproject.com.
+
+However, the only true guide is what your publisher will accept, so get a copy
+of those guidelines and fill in the gaps as best you can.
+
+If your referencing style guide requires a publisher name, use "Django Software
+Foundation".
+
+If you need a publishing location, use "Lawrence, Kansas".
+
+If you need a web address, use http://djangoproject.com.
+
+If you need a name, just use "Django", without any tagline.
+
+If you need a publication date, use the year of release of the version you're
+referencing (e.g., 2013 for v1.5)
+
+.. _APA style: http://www.apastyle.org
diff --git a/docs/faq/install.txt b/docs/faq/install.txt
index a92c9d87ea..5a4cab94cf 100644
--- a/docs/faq/install.txt
+++ b/docs/faq/install.txt
@@ -68,8 +68,10 @@ Django version Python versions
 1.1            2.3, 2.4, 2.5, 2.6
 1.2            2.4, 2.5, 2.6, 2.7
 1.3            2.4, 2.5, 2.6, 2.7
-**1.4**        **2.5, 2.6, 2.7**
-*1.5 (future)* *2.6, 2.7* and *3.2.3, 3.3 (experimental)*
+1.4            2.5, 2.6, 2.7
+1.5            2.6.5, 2.7 and 3.2.3, 3.3 (experimental)
+**1.6**        **2.6.5, 2.7** and **3.2.3, 3.3**
+*1.7 (future)* *2.7, 3.3 (to be confirmed)*
 ============== ===============
 
 Can I use Django with Python 3?
diff --git a/docs/faq/usage.txt b/docs/faq/usage.txt
index 151454398d..be3839e08f 100644
--- a/docs/faq/usage.txt
+++ b/docs/faq/usage.txt
@@ -52,10 +52,11 @@ Using a :class:`~django.db.models.FileField` or an
 
 #. All that will be stored in your database is a path to the file
    (relative to :setting:`MEDIA_ROOT`). You'll most likely want to use the
-   convenience :attr:`~django.core.files.File.url` attribute provided by
-   Django. For example, if your :class:`~django.db.models.ImageField` is
-   called ``mug_shot``, you can get the absolute path to your image in a
-   template with ``{{ object.mug_shot.url }}``.
+   convenience :attr:`~django.db.models.fields.files.FieldFile.url` attribute
+   provided by Django. For example, if your
+   :class:`~django.db.models.ImageField` is called ``mug_shot``, you can get
+   the absolute path to your image in a template with
+   ``{{ object.mug_shot.url }}``.
 
 How do I make a variable available to all my templates?
 -------------------------------------------------------