Added Doc conventions to glossary.

Change-Id: Icf2dcc52948e9d64568a0803a8a085f07abee4c6
Partial-Bug: #1121866
Merge "Added Doc conventions to glossary."