Fix default configuration not to use deprecated options (causing warnings in logs). Fixes #556
Fix small documentation errors
Note: these commits were previously part of #554, but now split into a separate PR, as no-one shouldn't object to them being merged. (as opposed to the dependency-removal)
Note: these commits were previously part of #554, but now split into a separate PR, as no-one shouldn't object to them being merged. (as opposed to the dependency-removal)