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

Conflicts:
	django/db/models/fields/related.py

2 files changed, 10 insertions, 15 deletions

diff --git a/docs/internals/contributing/triaging-tickets.txt b/docs/internals/contributing/triaging-tickets.txt
index bc6148ca46..43b799ed51 100644
--- a/docs/internals/contributing/triaging-tickets.txt
+++ b/docs/internals/contributing/triaging-tickets.txt
@@ -349,8 +349,9 @@ Then, you can help out by:
 
 * Closing "Unreviewed" tickets as "invalid", "worksforme" or "duplicate."
 
-* Closing "Unreviewed" tickets as "needsinfo" when they're feature requests
-  requiring a discussion on `django-developers`_.
+* Closing "Unreviewed" tickets as "needsinfo" when the description is too
+  sparse to be actionnable, or when they're feature requests requiring a
+  discussion on `django-developers`_.
 
 * Correcting the "Needs tests", "Needs documentation", or "Has patch"
   flags for tickets where they are incorrectly set.
diff --git a/docs/internals/contributing/writing-code/unit-tests.txt b/docs/internals/contributing/writing-code/unit-tests.txt
index f56bf1cdeb..0737b84888 100644
--- a/docs/internals/contributing/writing-code/unit-tests.txt
+++ b/docs/internals/contributing/writing-code/unit-tests.txt
@@ -27,15 +27,13 @@ Quickstart
 Running the tests requires a Django settings module that defines the
 databases to use. To make it easy to get started, Django provides a
 sample settings module that uses the SQLite database. To run the tests
-with this sample ``settings`` module, ``cd`` into the Django
-``tests/`` directory and run:
+with this sample ``settings`` module:
 
 .. code-block:: bash
 
-    ./runtests.py --settings=test_sqlite
-
-If you get an ``ImportError: No module named django.contrib`` error,
-you need to add your install of Django to your ``PYTHONPATH``.
+    git clone git@github.com:django/django.git django-repo
+    cd django-repo/tests
+    PYTHONPATH=..:$PYTHONPATH python ./runtests.py --settings=test_sqlite
 
 .. _running-unit-tests-settings:
 
@@ -47,14 +45,10 @@ SQLite. If you want to test behavior using a different database (and
 if you're proposing patches for Django, it's a good idea to test
 across databases), you may need to define your own settings file.
 
-To run the tests with different settings, ``cd`` to the ``tests/`` directory
-and type:
-
-.. code-block:: bash
-
-    ./runtests.py --settings=path.to.django.settings
+To run the tests with different settings, ensure that the module is on your
+``PYTHONPATH`` and pass the module with ``--settings``.
 
-The :setting:`DATABASES` setting in this test settings module needs to define
+The :setting:`DATABASES` setting in any test settings module needs to define
 two databases:
 
 * A ``default`` database. This database should use the backend that