Documentation improvements all around, without breaking server-plugin tests.

This is for 2.0.