Fix markup
Merge branch 'stable6' into fixing-stable6

Conflicts:
	admin_manual/configuration/configuration_preview.rst