chiark / gitweb /
journal: rework terminology