Closes SF patch #567867.

Added a couple of minor clarifications present in the 2.2.x and 2.3
version of the documentation which also apply to 2.1.x.