apply @carlaschroder's changes from owncloud/documentation#594
Additional changes to config.sample.php and typo fixes
Merge pull request #11486 from owncloud/config-update

Config update