Merge "Fix broken api link and put api link in one line"