Merge pull request #3206 from nhr/updates

Migrate most origin-server documentation