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

Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt

docs/howto/custom-management-commands.txt

@@ -193,7 +193,7 @@ Attributes
 ----------
 
 All attributes can be set in your derived class and can be used in
-:class:`BaseCommand`'s :ref:`subclasses<ref-basecommand-subclasses>`.
+:class:`BaseCommand`’s :ref:`subclasses<ref-basecommand-subclasses>`.
 
 .. attribute:: BaseCommand.args
 
@@ -245,7 +245,7 @@ All attributes can be set in your derived class and can be used in
   Make sure you know what you are doing if you decide to change the value of
   this option in your custom command if it creates database content that
   is locale-sensitive and such content shouldn't contain any translations (like
-  it happens e.g. with django.contrim.auth permissions) as making the locale
+  it happens e.g. with django.contrib.auth permissions) as making the locale
   differ from the de facto default 'en-us' might cause unintended effects. See
   the `Management commands and locales`_ section above for further details.
 
@@ -267,7 +267,7 @@ the :meth:`~BaseCommand.handle` method must be implemented.
 .. admonition:: Implementing a constructor in a subclass
 
   If you implement ``__init__`` in your subclass of :class:`BaseCommand`,
-  you must call :class:`BaseCommand`'s ``__init__``.
+  you must call :class:`BaseCommand`’s ``__init__``.
 
   .. code-block:: python
 

docs/howto/deployment/checklist.txt

@@ -206,6 +206,21 @@ See :doc:`/howto/error-reporting` for details on error reporting by email.
 
     .. _Sentry: http://sentry.readthedocs.org/en/latest/
 
+Customize the default error views
+---------------------------------
+
+Django includes default views and templates for several HTTP error codes. You
+may want to override the default templates by creating the following templates
+in your root template directory: ``404.html``, ``500.html``, ``403.html``, and
+``400.html``. The default views should suffice for 99% of Web applications, but
+if you desire to customize them, see these instructions which also contain
+details about the default templates:
+
+* :ref:`http_not_found_view`
+* :ref:`http_internal_server_error_view`
+* :ref:`http_forbidden_view`
+* :ref:`http_bad_request_view`
+
 Miscellaneous
 =============
 

docs/howto/deployment/fastcgi.txt

@@ -2,6 +2,9 @@
 How to use Django with FastCGI, SCGI, or AJP
 ============================================
 
+.. deprecated:: 1.7
+    FastCGI support is deprecated and will be removed in Django 1.9.
+
 .. highlight:: bash
 
 Although :doc:`WSGI</howto/deployment/wsgi/index>` is the preferred deployment

docs/howto/deployment/index.txt

@@ -10,9 +10,15 @@ ways to easily deploy Django:
    :maxdepth: 1
 
    wsgi/index
-   fastcgi
    checklist
 
+FastCGI support is deprecated and will be removed in Django 1.9.
+
+.. toctree::
+   :maxdepth: 1
+
+   fastcgi
+
 If you're new to deploying Django and/or Python, we'd recommend you try
 :doc:`mod_wsgi </howto/deployment/wsgi/modwsgi>` first. In most cases it'll be
 the easiest, fastest, and most stable deployment choice.

docs/howto/error-reporting.txt

@@ -120,8 +120,8 @@ Filtering sensitive information
 Error reports are really helpful for debugging errors, so it is generally
 useful to record as much relevant information about those errors as possible.
 For example, by default Django records the `full traceback`_ for the
-exception raised, each `traceback frame`_'s local variables, and the
-:class:`~django.http.HttpRequest`'s :ref:`attributes<httprequest-attributes>`.
+exception raised, each `traceback frame`_’s local variables, and the
+:class:`~django.http.HttpRequest`’s :ref:`attributes<httprequest-attributes>`.
 
 However, sometimes certain types of information may be too sensitive and thus
 may not be appropriate to be kept track of, for example a user's password or
@@ -164,7 +164,7 @@ production environment (that is, where :setting:`DEBUG` is set to ``False``):
     .. admonition:: When using mutiple decorators
 
         If the variable you want to hide is also a function argument (e.g.
-        '``user``' in the following example), and if the decorated function has
+        '``user``’ in the following example), and if the decorated function has
         mutiple decorators, then make sure to place ``@sensitive_variables`` at
         the top of the decorator chain. This way it will also hide the function
         argument as it gets passed through the other decorators::
@@ -232,7 +232,7 @@ own filter class and tell Django to use it via the
     DEFAULT_EXCEPTION_REPORTER_FILTER = 'path.to.your.CustomExceptionReporterFilter'
 
 You may also control in a more granular way which filter to use within any
-given view by setting the ``HttpRequest``'s ``exception_reporter_filter``
+given view by setting the ``HttpRequest``’s ``exception_reporter_filter``
 attribute::
 
     def my_view(request):

docs/howto/initial-data.txt

@@ -142,7 +142,7 @@ database tables already will have been created.
 
     If you require data for a test case, you should add it using
     either a :ref:`test fixture <topics-testing-fixtures>`, or
-    programatically add it during the ``setUp()`` of your test case.
+    programmatically add it during the ``setUp()`` of your test case.
 
 Database-backend-specific SQL data
 ----------------------------------