* merge fixes for SGML syntax errors (does no one ever regenerate the docs?)