Doc fixes. Merged eb/t367 -r11020:11025 to trunk. This changeset