Minor fixes and increasing consistency in sysadmin docs. (rebase)

rebases #311