Merge master
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Merge pull request #931 from mindlace-mp/writable-nested-modelserializer

Merged master into writable-nested-modelserializer.
Merge branch 'master' into writable-nested-modelserializer
Merge branch 'writable-nested-modelserializer' of https://github.com/tomchristie/django-rest-framework into writable-nested-modelserializer
Merge branch 'master' into writable-nested-modelserializer
Merge pull request #1 from tomchristie/master

Update from main
Update nested serialization docs
Fix docs typo
pedantic doc updates
Merge pull request #991 from ericbuehl/master

pedantic doc updates
Modified documentation for CSRF as mentioned in #984
Merge pull request #993 from kevin-brown/issue_984_docs

Made the CSRF documentation more clear
Merge pull request #985 from maspwr/writable-nested-modelserializer-docs

Update nested serialization docs
Updated EmailField error message. This one already available in django translations.

https://github.com/django/django/blob/master/django/conf/locale/ru/LC_MESSAGES/django.po#L343
Fixed test
added script block to list of blocks

Phew, was afraid I wouldn't be able to overwrite this section..
Merge pull request #996 from speg/patch-1

added script block to list of blocks
Merge pull request #995 from pzinovkin/patch-1

Updated EmailField error message.