diff --git a/content/v2.0/UI/sources.md b/content/v2.0/UI/sources.md
index 83246bacc..e25abfc83 100644
--- a/content/v2.0/UI/sources.md
+++ b/content/v2.0/UI/sources.md
@@ -65,7 +65,9 @@ Chronograf supports many different [visualization types](/chronograf/latest/guid
 ### Step 5: Save your cell
 Click **Save** (the green checkmark icon) to save your cell.
 
-> ***Note:*** if you navigate away from this page without clicking Save, your work will not be saved.
+{{% note %}}
+If you navigate away from this page without clicking Save, your work will not be saved.
+{{% /note %}}
 
 ### Step 6: Configure your dashboard
 
@@ -79,8 +81,9 @@ Click **Save** (the green checkmark icon) to save your cell.
 * **Pan** over your cell data by pressing the shift key and clicking and dragging your mouse over the graph
 * **Reset** your cell by double-clicking your mouse in the cell window
 
-> Note:
+{{% note %}}
 These tips only apply to the line, stacked, step-plot, and line+stat [visualization types](/chronograf/latest/guides/visualization-types/).
+{{% /note %}}
 
 #### Configure dashboard-wide settings:
 * You can change the dashboard's *auto-refresh interval* at the top of the page - the default interval selected is **Every 15 seconds**.
diff --git a/content/v2.0/UI/visualization-types.md b/content/v2.0/UI/visualization-types.md
index 36c46e4a4..97a0de315 100644
--- a/content/v2.0/UI/visualization-types.md
+++ b/content/v2.0/UI/visualization-types.md
@@ -248,7 +248,9 @@ Use the **Table Controls** to specify the following:
   - Change the order of the column by dragging to the desired position.
 * **Thresholds**
 
-> **Note:** Threshold settings apply to any cells with values, except when they appear in the first column and **Lock First Column** is enabled.
+{{% note %}}
+Threshold settings apply to any cells with values, except when they appear in the first column and **Lock First Column** is enabled.
+{{% /note %}}
 
   - **Add Threshold** (button): Click to add a threshold.
   - **Base Color**: Select a base, or background, color from the selection list.
diff --git a/content/v2.0/reference/flux/functions/transformations/fill.md b/content/v2.0/reference/flux/functions/transformations/fill.md
index 7e221cad7..d021e47bb 100644
--- a/content/v2.0/reference/flux/functions/transformations/fill.md
+++ b/content/v2.0/reference/flux/functions/transformations/fill.md
@@ -37,7 +37,9 @@ _**Data type:** Boolean | Integer | UInteger | Float | String | Time | Duration_
 ### usePrevious
 When `true`, assigns the value set in the previous non-null row.
 
-> Cannot be used with `value`.
+{{% note %}}
+Cannot be used with `value`.
+{{% /note %}}
 
 _**Data type:** Boolean | Integer | UInteger | Float | String | Time | Duration_
 
diff --git a/content/v2.0/reference/flux/functions/transformations/join.md b/content/v2.0/reference/flux/functions/transformations/join.md
index ceeb95f55..43d05b900 100644
--- a/content/v2.0/reference/flux/functions/transformations/join.md
+++ b/content/v2.0/reference/flux/functions/transformations/join.md
@@ -48,7 +48,9 @@ The map of streams to be joined. <span style="color:#FF8564; font-weight:700;">R
 
 _**Data type:** Object_
 
-> `join()` currently only supports two input streams.
+{{% note %}}
+`join()` currently only supports two input streams.
+{{% /note %}}
 
 ### on
 The list of columns on which to join. <span style="color:#FF8564; font-weight:700;">Required</span>.
diff --git a/content/v2.0/reference/flux/functions/transformations/window.md b/content/v2.0/reference/flux/functions/transformations/window.md
index e2331f508..df8c82c53 100644
--- a/content/v2.0/reference/flux/functions/transformations/window.md
+++ b/content/v2.0/reference/flux/functions/transformations/window.md
@@ -74,7 +74,9 @@ _**Data type:** Function_
 intervals(every:1d, period:8h, offset:9h)
 ```
 
-> When `intervals` is used, `every`, `period`, and `start` cannot be used or need to be set to 0.
+{{% note %}}
+When `intervals` is used, `every`, `period`, and `start` cannot be used or need to be set to 0.
+{{% /note %}}
 
 ### timeColumn
 The column containing time.