Merge "doc change: miscellaneous small fixes." into froyo