to Node objects in the index (closes SF bug #832251)
- fix a variety of markup nits

Backported from trunk revision 1.9.