Merge "Fixed some doc bugs"

No match.