In line with the new documentation.

Change-Id: I06eb97b99bd79b7c7a4ff4ecc67c96cf39650e52
Reviewed-by: hjk <qthjk@ovi.com>