Merge "Some documentation fixes." into gingerbread