Merge pull request #3318 from nawroth/2.0-extract-docs-config

Move config for the manual to doctools.
Merge pull request #3322 from nawroth/2.1-maint

Move config for the manual to doctools.
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'