Merge "[Contributor Guide] Add glossary"

doc/contributor-guide/source/common

@@ -0,0 +1 @@
+../../common-rst/

doc/contributor-guide/source/conf.py

@@ -94,7 +94,10 @@ html_context = {"gitsha": gitsha, "bug_tag": bug_tag,
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = []
+exclude_patterns = ['common/app_support.rst', 'common/cli*', 'common/nova*',
+                    'common/get_started*', 'common/dashboard*',
+                    'common/conventions.rst', 'common/log_in_dashboard.rst']
+
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.

doc/contributor-guide/source/index.rst

@@ -31,6 +31,8 @@ Contents
    blueprints-and-specs.rst
    json-conventions.rst
 
+   common/glossary.rst
+
 Search in this guide
 ~~~~~~~~~~~~~~~~~~~~
 

doc/contributor-guide/source/rst-conv/inline-markups.rst

@@ -89,7 +89,8 @@ A term that appears in the glossary.
 +------------------------+---------------------------------------------------+
 | **Syntax**             | ``:term:`bare```                                  |
 +------------------------+---------------------------------------------------+
-| **Example of output**  |                                                   |
+| **Example of output**  | Upload the image to the Image service using       |
+|                        | the :term:`bare` container format.                |
 +------------------------+---------------------------------------------------+
 
 GUI element