Documentation: try to make it work nicely
Merge pull request #1956 from sposs/fix_doc

[v6r11] Documentation: try to make it work nicely