Merge "Update the old doc links"