guide/glossary.markdown: revise some terms, add others