20141210 Terminology 2.0

Revision using the template suggested by Dieter.