Docs improvements

Fixes: bug #1204831

Change-Id: I503c320dbf91c8737adde95ac94ac392784d0de8
(cherry picked from commit 74025fc5f16e439d3548c86f18d3b18c6f7eaa89)