Merge HTMLParser doc changes from 3.2.