[1.5.x] Reworded a paragraph in the logging docs.

9d12f68a53 from master.
[1.5.x] Final attempt to solve sporadic test failures.

tearDownClass is not called if setUpClass throws an exception, in our case
this means that LiveServerTestCase leaks LiveServerThread sockets if the
test happens to be skipped later on, and AdminSeleniumWebDriverTestCase
doesn't close it's already open browser window. To prevent this leakage
we catch errors where needed and manually call _tearDownClassInternal.
_tearDownClassInternal should be written as defensively as possible since
it is not allowed to make any assumptions on how far setUpClass got.

This patch should fix the sporadic "Address already in use"-errors on jenkins
and also the "This code isn't under transaction management"-error for sqlite
(also just on jenkins).

After discussion with koniiiik, jezdez, kmtracey, tos9, lifeless, nedbat and
voidspace it was decided that this is the safest approach (thanks to everyone
for their comments and help). Manually calling tearDownClass was shut down
cause we don't know how our users override our classes.

This is a private and very specialized API on purpose and should not be used
without a strong reason!

This patch partially reverts the earlier attempts to fix those issues,
namely:
	2fa0dd73b18f55d0fdd1c1d54b1d18031bfcf1ed and
	3c5775d36f7e431d9691829a78580873111cb714

Final note: If this patch breaks in a later version of Django, please be
very careful on how you fix it, you might not see test failures locally.
That said, this patch hopefully doesn't produce even more failures.

Backport of 73a610d2a81bc3bf2d3834786b2458bc85953ed0 from master.
[1.5.x] Silenced last sporadic failure on 1.5.

This commit is a last resort; technically the test is correct but our testsuite
has some threading issues when LiveServer is used. Since this will never get
fixed in 1.5 and apperently doesn't get triggered on 1.6 we just make sure the
test doesn't error out. I am not 100% sure why this actually fixes the issue,
but this is still better than having failing builds wheneever we do a security
release for 1.5.

(Tested on jenkins itself, should work (tm)).
[1.5.x] Fixed #21118 -- Isolated a test that uses the database.

Thanks rmboggs for the report.

Backport of 4f40b97d97 from master
Revert "[1.5.x] Silenced last sporadic failure on 1.5."

This reverts commit 6a708cd654fe63278ea8a14b3e44da847c62ebf4.

Reverted since it only moved the failures to some other tests and it apperently
only worked by accident. Patched selenium for now to include:
https://github.com/SeleniumHQ/selenium/pull/118
which seems to be the root cause for sporadic extra requests to the live server,
which then cause all sorts of issues.
[1.5.x] Fixed #21121: Added archive of security issues.

Backport of 9d3e60a, 8e134c2, 8b3bae9, c65ae7c, bbabc53,
and a2e25e8 from master.
[1.5.x] Added __pycache__ to gitignore

Backport of 55b9bff07f from master
[1.5.x] Added missing "in" in sentence.

Backport of 2c5c422d34 from master
[1.5.x] Fixed #21133 -- Clarifed documentation about strftime formatting.

Backport of 43a2ec7999 from master
[1.5.x] Fixed #21137 -- Documented best practice for URLconfs with repeated pattern prefixes.

Backport of 222460a994 from master
[1.5.x] Correct very minor typo

Just changed as to has.

Backport of d8f2d940cc from master
[1.5.x] Fixed a couple of typos in GeoDjango docs.

8b366a50f4 from master.
[1.5.x] Reference Meta.index_together in DB performance guide.

9dc45efeba from master.
[1.5.x] Fixed "Address already in use" from liveserver.

Our WSGIServer rewrapped the socket errors from server_bind into
WSGIServerExceptions, which is used later on to provide nicer
error messages in runserver and used by the liveserver to see if
the port is already in use. But wrapping server_bind isn't enough since
it only binds to the socket, socket.listen (which is called from
server_activate) could also raise "Address already in use".

Instead of overriding server_activate too I chose to just catch socket
errors, which seems to make more sense anyways and should be more robust
against changes in wsgiref.

Backport of 2ca00faa913754cd5860f6e1f23c8da2529c691a from master
[1.5.x] Stopped a test from executing queries at the module level.

Currently module level queries are executed against the real database
(specified in NAME) instead of the test database; since it is to late
to fix this for 1.6, we at least ensures stable builds. Refs #21443.

Backport of 4fcc1e4ad8d153f41132b171c231b6d5d4086c28 from master.
[1.5.x] Fixed #21702 -- Added different bullet styles for nested lists.

Thanks moc at mocpa.com for the suggestion.

Backport of c81b6f7b83 from master
[1.5.x] Fixed #21120 -- Added more explicit text on using validators and link to writing validators.

Thanks nicolas at niconomicon.net for the suggestion.

Backport of 98e0453f00 from master
[1.5.x] Fixed #20830 -- Clarified that Django uses a customized version of six.

Thanks glarrain for the suggestion.

Backport of a53caf28bf from master
[1.5.x] Removed implication that six is part of Python stdlib.

Backport of 45969bdeb5 from master
[1.5.x] Removed extra p (topppings->toppings)

Backport of 946a2226ea from master