[1.7.x] Fixed and enhanced new HTML form docs.

Backport of ec85df2fa5 from master