Merge "Fix up additional broken documentation links."