the work of the XML-SIG in the main body of the text.  Incorporates
changes made by Martin von Löwis in revision 1.20 on the trunk.

Modify the markup in a few places to avoid wrapping lines in bad
places, and just general cleanliness.