Issue #2171015 by webchick: fixed some language/documentation issues.