applying outdated patch files and wording change for help

https://code.djangoproject.com/ticket/16330#propertyform