Create a branch to fix links on.
Fix the people links in the conversion documentation.
Merge from trunk, finally.
Merge from trunk.
Roll back links to the beta site.
Change people links to link to the site.