Merge branch 'master' into htmlmail

* master:
  extended some config options a bit, to make more clear what they do
  rearranged the config options

Conflicts:
	conf/dokuwiki.php
	lib/plugins/config/lang/en/lang.php
	lib/plugins/config/settings/config.metadata.php