tweak server docs (rebased from dev_5_0)

--rebased-from #951 last commits