diff --git a/contribute/style-guides/documentation-style-guide.md b/contribute/style-guides/documentation-style-guide.md
index ab86e5cd9e3..04e0eeb4d4b 100644
--- a/contribute/style-guides/documentation-style-guide.md
+++ b/contribute/style-guides/documentation-style-guide.md
@@ -213,6 +213,10 @@ Do not use. This is developer jargon that refers to a UI panel. Refer to the pan
 
 One word, not two.
 
+#### mixin
+
+One word, not two. Also, not hyphenated.
+
 #### open source, open-source
 
 Do not hyphenate when used as an adjective unless the lack of hyphen would cause confusion. For example: _Open source software design is the most open open-source system I can imagine._
diff --git a/docs/sources/getting-started/glossary.md b/docs/sources/getting-started/glossary.md
index 6dfee100b03..73274625ae6 100644
--- a/docs/sources/getting-started/glossary.md
+++ b/docs/sources/getting-started/glossary.md
@@ -40,12 +40,36 @@ This topic lists words and abbreviations that are commonly used in the Grafana d
       Explore allows a user to focus on a building a query. User can refine the query to return the expected metrics before building a dashboard.
     </td>
   </tr>
+  <tr>
+    <td style="vertical-align: top">Export/Import dashboard</td>
+    <td>
+      Grafana includes the ability to export your dashboards to a file containing JSON. Community members sometimes share their created dashboards on the [Grafana Dashboards page](https://grafana.com/grafana/dashboards). Dashboards previously exported or found on this site may be imported by other users.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top">Exporter</td>
+    <td>
+      An exporter translates data that comes out of a data source into a format that Prometheus can digest.
+    </td>
+  </tr>
+  <tr>
+    <td style="vertical-align: top">Integration (Grafana Cloud)</td>
+    <td>
+      Each Integration in Grafana Cloud uses the cloud agent to connect your data source to Grafana Cloud for visualizing. Note: Prometheus uses the word “integrations” to refer to software that exposes Prometheus metrics without needing an exporter, which is a different use of the same word we use here.
+    </td>
+  </tr>
   <tr>
     <td style="vertical-align: top">Graph</td>
     <td>
       A commonly-used visualization that displays data as points, lines, or bars.
     </td>
   </tr>
+  <tr>
+    <td style="vertical-align: top">Mixin</td>
+    <td>
+      A mixin is a set of Grafana dashboards and Prometheus rules and alerts, written in Jsonnet and packaged together in a bundle.
+    </td>
+  </tr>
   <tr>
     <td style="vertical-align: top">Panel</td>
     <td>