Just ended up spending today working on converting this to DocBook, to have more flexibility, and then deciding that just isn't worth it. So... We've got it back to the previous version with new updates. But only minor ones.
