Fix various lon-gstanding doc issues. I'm not sure I've understood everything about the new doc architecture. @dotta, I'd appreciate your taking a look at this, esp. 738c58e.

I'm not sure I've