documentation for #4369
Fix merge conflict documenting #4369
Conflicts:
	doc/version-history/8-2.history.tex