> here you have remaining doc-related changes included in Debian.

Thanks. I installed the attached patch, which should fix the problems noted 
(though with different wording), and am marking this bug as done.