diff --git a/_config.yml b/_config.yml
index 6141892468..3dddb3f807 100644
--- a/_config.yml
+++ b/_config.yml
@@ -70,6 +70,10 @@ defaults:
       path: engine/reference/commandline
     values:
       edit_url: "https://github.com/docker/cli/tree/master/docs/reference/commandline"
+  - scope:
+      path: glossary
+    values:
+      edit_url: "https://github.com/docker/docker.github.io/blob/master/_data/glossary.yaml"
   - scope:
       path: notary/reference
     values:
diff --git a/_config_authoring.yml b/_config_authoring.yml
index 6c548907c7..b0149a2345 100644
--- a/_config_authoring.yml
+++ b/_config_authoring.yml
@@ -68,6 +68,10 @@ defaults:
       path: engine/reference/commandline
     values:
       edit_url: "https://github.com/docker/cli/tree/master/docs/reference/commandline"
+  - scope:
+      path: glossary
+    values:
+      edit_url: "https://github.com/docker/docker.github.io/blob/master/_data/glossary.yaml"
   - scope:
       path: notary/reference
     values:
diff --git a/js/glossary.js b/js/glossary.js
index 3cabd25e1c..4d02ca6b66 100644
--- a/js/glossary.js
+++ b/js/glossary.js
@@ -1,11 +1,6 @@
----
-layout: null
----
 var glossary = [
-{% for entry in site.data.glossary %}
-{
-"term": {{ entry[0] | jsonify }},
-"def": {{ entry[1] | markdownify | replace:'href="#','href="/glossary/?term=' | jsonify }}
-}{% unless forloop.last %},{% endunless %}
-{% endfor %}
+{%- for entry in site.data.glossary -%}
+    {"term": {{ entry[0] | jsonify }}, "def": {{ entry[1] | markdownify | replace:'href="#','href="/glossary/?term=' | jsonify }}}
+    {%- unless forloop.last -%},{%- endunless -%}
+{%- endfor -%}
 ]