Create a branch to fix links on.
Update/fix a load of links, add a missing jamfile.
Merge from trunk, finally.
Merge from trunk.
Merge from trunk.
Merge.
Merge.
Merge.
Merge.
Roll back links to the beta site.
Merge from trunk.