Merge "docs: a couple doc bug fixes" into froyo