Merge "Update device-entry docs + add glossary" into tm-dev