documentation: merge & adapt suggestions from baus
Merge pull request #916 from Supermathie/sysadmin-docs

documentation: merge & adapt suggestions from baus