3637: Make sure XML in documentation is valid XML!
Merge branch 'master_3637'

Conflicts:
	doc/factory/configuration.html