server descriptor formatting (part 4)
I haven't bothered tidying the formatting of entries I moved to historical, nor ones I'm hoping will move to historical as per #294 (which means if we don't manage to get rid of those there'll need to be more done to these parts of the spec).