Merge "Update multi-site docs to resemble current state of the project"