Documentation improvements

https://code.djangoproject.com/ticket/19752

ref #19752