2.4 version.

Reflect the 2.4 changes from the English documentation.