More docs. Glossary.
diff --git a/src/gallium/docs/source/conf.py b/src/gallium/docs/source/conf.py
index 7ff4896..2b974b7 100644
--- a/src/gallium/docs/source/conf.py
+++ b/src/gallium/docs/source/conf.py
@@ -83,6 +83,9 @@
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
 
+# The language for highlighting source code.
+highlight_language = 'c'
+
 # A list of ignored prefixes for module index sorting.
 #modindex_common_prefix = []
 
diff --git a/src/gallium/docs/source/cso/rasterizer.rst b/src/gallium/docs/source/cso/rasterizer.rst
index 0686bff..afb58ea 100644
--- a/src/gallium/docs/source/cso/rasterizer.rst
+++ b/src/gallium/docs/source/cso/rasterizer.rst
@@ -29,7 +29,7 @@
 point_size_per_vertex
     Whether vertices have a point size element.
 multisample
-    Whether MSAA is enabled.
+    Whether :ref:`MSAA` is enabled.
 line_smooth
     Whether lines should be smoothed. Line smoothing is simply anti-aliasing.
 line_stipple_enable
@@ -77,10 +77,11 @@
 
 There are several important exceptions to the specification of this rule.
 
-* PIPE_PRIMITIVE_POLYGON: The provoking vertex is always the first vertex.
-  If the caller wishes to change the provoking vertex, they merely need to
-  rotate the vertices themselves.
-* PIPE_PRIMITIVE_QUAD, PIPE_PRIMITIVE_QUAD_STRIP: This option has no effect.
-* PIPE_PRIMITIVE_TRIANGLE_FAN: When set, the provoking vertex is the second
-  vertex, not the first. This permits each segment of the fan to have a
-  different color.
+* ``PIPE_PRIMITIVE_POLYGON``: The provoking vertex is always the first
+  vertex. If the caller wishes to change the provoking vertex, they merely
+  need to rotate the vertices themselves.
+* ``PIPE_PRIMITIVE_QUAD``, ``PIPE_PRIMITIVE_QUAD_STRIP``: This option has no
+  effect; the provoking vertex is always the last vertex.
+* ``PIPE_PRIMITIVE_TRIANGLE_FAN``: When set, the provoking vertex is the
+  second vertex, not the first. This permits each segment of the fan to have
+  a different color.
diff --git a/src/gallium/docs/source/glossary.rst b/src/gallium/docs/source/glossary.rst
new file mode 100644
index 0000000..6a9110c
--- /dev/null
+++ b/src/gallium/docs/source/glossary.rst
@@ -0,0 +1,10 @@
+Glossary
+========
+
+.. glossary::
+   :sorted:
+
+   MSAA
+      Multi-Sampled Anti-Aliasing. A basic anti-aliasing technique that takes
+      multiple samples of the depth buffer, and uses this information to
+      smooth the edges of polygons.
diff --git a/src/gallium/docs/source/index.rst b/src/gallium/docs/source/index.rst
index e1b04e6..1800bbe 100644
--- a/src/gallium/docs/source/index.rst
+++ b/src/gallium/docs/source/index.rst
@@ -16,6 +16,7 @@
    screen
    context
    cso
+   glossary
 
 Indices and tables
 ==================