Merge "SDK doc change: Misc small fixes." into eclair