Merge stderr and stdout when checking for timeouts
Strip trailing whitespace
Add missing blank line before end tag
Reformat examples section so that it can be output properly

Also tidy up pan a little for style.
Improve resources section

Apply code tags as suggested by @wdpypere.
Listify list items.
Clarify text.
Add code tag around variable
Document purposes of schema paths
Point out that `initdir` is optional
Make `artifactId` consistent with other configuration module repos

Fixes quattor/release#34
Merge pull request #277 from jrha/documentation-dirperm

Improve dirperm documentation
Merge pull request #279 from jrha/artifact-tag-naming

Make `artifactId` consistent with other configuration module repos
Merge pull request #223 from piojo/resolver-fix

ncm-resolver: Merge stderr and stdout when checking for timeouts