Merge changes from the English version:
1.282 -> 1.287 contrib/chapter.sgml 1.84 -> 1.85 mirrors/chapter.sgml