- minor markup cleanup (forward-ported from release25-maint revision 51888)
/F wrote the text docs, Englebert Gruber massaged it to latex and I did some more massaging to try and improve the consistency and fix some name mismatches between the declaration and text.