[1.4.X] Fixed #18379 -- Made the sensitive_variables decorator work with object methods.
[1.4.x] readd imports deleted in 4d2fdd
Merge pull request #109 from apollo13/fix4d2fdd

Fix test error.
[1.4.x] Rewrote security.txt SSL docs, noting SECURE_PROXY_SSL_HEADER.

Backport of 0199bdc0b from master
[1.4.x] Noted that SECURE_PROXY_SSL_HEADER is needed by CSRF protection.

Both false positives and false negatives of HttpRequest.is_secure can be
dangerous.

Backport of 840ffd80ba from master
[1.4.X] Replaced documentation snippets using "gender" with less sensitive examples.

Backport of [7edf231] from master.
[1.4.x] Added more explicit warnings about unconfigured reStructured Text usage in docs.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17915 bcc190cf-cafb-0310-a4f2-bffc1f526a37

Backport of 718f149b from master
[1.4.X] Fixed #18369 - Fixed argument name in render() function; thanks qsolo825@ for the report.

Backport of 1cf8287e3a from master
[1.4.X] Fixed #17511 - Removed reference to deprecated "reset" management command in FAQ; thanks voxpuibr@ for the report.

Backport of c8928b91b5 from master
[1.4.x] Fixed #18528 -- Fixed custom field value_to_string example

Thanks anuraguniyal for the report.
[1.4.X] Fixed #17168 - Noted TransactionMiddleware only works with "default" database alias.

Thanks codeinthehole for the draft patch.

Backport of 5d81ad1af1 from master
[1.4.X] Fixed #18145 -- Improved documentation of unique_together type fields

Backport of 55ffcf8e7b from master
[1.4.X] Fixed #17705 - Updated TabularInline image and doc in tutorial 2.

Thanks xbito for the draft patch.

Backport of c5fb8299ef from master
[1.4.X] Fixed #18493 - Added instructions to locate the Django source files to the t

Thanks Claude Paroz for the draft patch.

Backport of c68f4c514c from master
[1.4.X] Fixed #16882 - Clarified why one should not use 'init_command' after initial database creation.

Backport of 9974069620 from master
[1.4.X] Fixed #17436 - Added warning about overriding Model.__init__()

Thanks zsiciarz for the draft patch.

Backport of 7313468f85 from master
[1.4.X] Fixed #17997 - Documented that the debug server is now multithreaded by default.

Thanks trey.smith@ for the report and vanessagomes for the patch.

Backport of e4a1407a9c from master
[1.4x] Fixed #18587 -- Typo in management command example

Thanks Frank Wiles.

Backport of 29ca3d3c4b3d330337cce8713196ef7eea956dc9 from master.
[1.4.x] Fixed #18164 -- Precised startapp template context content

Backport of 249c445446 from master.
[1.4.x] Fixed #17978 -- Fixed a minor layout issue when an inline contains a filter horizontal widget. Thanks to Aymeric Augustin for the report.