Merge "SDK doc change: Miscellaneous fixes." into eclair