Merge "(bug 1) doc for SiteConfiguration"