DOCS-1723 glossary edits - part 1

Ready for merge.