More glossary entries and adapt to new :wikipedia: role

Change-Id: Ibbb6ab5d3b5b615d086ad6aea626efad8ee83d7f