Fix and enrich documentation labels
Merge pull request #463 from emmanuel-keller/master

Fix and enrich documentation labels