Documentation improvements all around.
Merge pull request #1579 from nawroth/2.0-fixes

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