Updating doc links.
Merged joey changes.