DOCS-1723 glossary edits - part 2

Ready for Merge. This completes DOCS-1723.