More documentation followup/cleanup for Bug#4054.