Fix links and improve wording for Bug 818316