Even more spelling fixes

No functional change.
Clarify definition of capture_or_promotion()

No functional change.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/search.cpp