diff --git a/docs/reference/builder.md b/docs/reference/builder.md
index 68b2db1f63..2b85edd984 100644
--- a/docs/reference/builder.md
+++ b/docs/reference/builder.md
@@ -1,7 +1,7 @@
 ---
 title: "Dockerfile reference"
 description: "Dockerfiles use a simple DSL which allows you to automate the steps you would normally manually take to create an image."
-keywords: ["builder, docker, Dockerfile, automation,  image creation"]
+keywords: "builder, docker, Dockerfile, automation, image creation"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/attach.md b/docs/reference/commandline/attach.md
index 25cdfe5f9b..307068a339 100644
--- a/docs/reference/commandline/attach.md
+++ b/docs/reference/commandline/attach.md
@@ -1,7 +1,7 @@
 ---
 title: "attach"
 description: "The attach command description and usage"
-keywords: ["attach, running, container"]
+keywords: "attach, running, container"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/build.md b/docs/reference/commandline/build.md
index d5c08fec48..beca9fa61a 100644
--- a/docs/reference/commandline/build.md
+++ b/docs/reference/commandline/build.md
@@ -1,7 +1,7 @@
 ---
 title: "build"
 description: "The build command description and usage"
-keywords: ["build, docker, image"]
+keywords: "build, docker, image"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/cli.md b/docs/reference/commandline/cli.md
index 9ca919892c..6fd3b01107 100644
--- a/docs/reference/commandline/cli.md
+++ b/docs/reference/commandline/cli.md
@@ -1,7 +1,7 @@
 ---
 title: "Use the Docker command line"
 description: "Docker's CLI command description and usage"
-keywords: ["Docker, Docker documentation, CLI,  command line"]
+keywords: "Docker, Docker documentation, CLI, command line"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/commit.md b/docs/reference/commandline/commit.md
index 4cccd6f5b9..8f971a5d95 100644
--- a/docs/reference/commandline/commit.md
+++ b/docs/reference/commandline/commit.md
@@ -1,7 +1,7 @@
 ---
 title: "commit"
 description: "The commit command description and usage"
-keywords: ["commit, file, changes"]
+keywords: "commit, file, changes"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/container_prune.md b/docs/reference/commandline/container_prune.md
index 3332d7653d..43156406ec 100644
--- a/docs/reference/commandline/container_prune.md
+++ b/docs/reference/commandline/container_prune.md
@@ -1,7 +1,7 @@
 ---
 title: "container prune"
 description: "Remove all stopped containers"
-keywords: [container, prune, delete, remove]
+keywords: container, prune, delete, remove
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/cp.md b/docs/reference/commandline/cp.md
index 52c58633ef..fcfd35fce1 100644
--- a/docs/reference/commandline/cp.md
+++ b/docs/reference/commandline/cp.md
@@ -1,7 +1,7 @@
 ---
 title: "cp"
 description: "The cp command description and usage"
-keywords: ["copy, container, files, folders"]
+keywords: "copy, container, files, folders"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/create.md b/docs/reference/commandline/create.md
index e621efeb1f..5e3c04efa5 100644
--- a/docs/reference/commandline/create.md
+++ b/docs/reference/commandline/create.md
@@ -1,7 +1,7 @@
 ---
 title: "create"
 description: "The create command description and usage"
-keywords: ["docker, create, container"]
+keywords: "docker, create, container"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/deploy.md b/docs/reference/commandline/deploy.md
index fb6e0b5c2b..bafd9c497f 100644
--- a/docs/reference/commandline/deploy.md
+++ b/docs/reference/commandline/deploy.md
@@ -1,7 +1,7 @@
 ---
 title: "deploy"
 description: "The deploy command description and usage"
-keywords: ["stack, deploy"]
+keywords: "stack, deploy"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/diff.md b/docs/reference/commandline/diff.md
index 2018422370..ac47e33d3c 100644
--- a/docs/reference/commandline/diff.md
+++ b/docs/reference/commandline/diff.md
@@ -1,7 +1,7 @@
 ---
 title: "diff"
 description: "The diff command description and usage"
-keywords: ["list, changed, files, container"]
+keywords: "list, changed, files, container"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md
index 31cff29f17..0fa6a63eb9 100644
--- a/docs/reference/commandline/dockerd.md
+++ b/docs/reference/commandline/dockerd.md
@@ -2,7 +2,7 @@
 title: "dockerd"
 aliases: ["/engine/reference/commandline/daemon/"]
 description: "The daemon command description and usage"
-keywords: ["container, daemon, runtime"]
+keywords: "container, daemon, runtime"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/events.md b/docs/reference/commandline/events.md
index 44e51fe1bb..24af2ab482 100644
--- a/docs/reference/commandline/events.md
+++ b/docs/reference/commandline/events.md
@@ -1,7 +1,7 @@
 ---
 title: "events"
 description: "The events command description and usage"
-keywords: ["events, container, report"]
+keywords: "events, container, report"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/exec.md b/docs/reference/commandline/exec.md
index cb569a253a..38891c9ea0 100644
--- a/docs/reference/commandline/exec.md
+++ b/docs/reference/commandline/exec.md
@@ -1,7 +1,7 @@
 ---
 title: "exec"
 description: "The exec command description and usage"
-keywords: ["command, container, run, execute"]
+keywords: "command, container, run, execute"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/export.md b/docs/reference/commandline/export.md
index d3a9fefa32..1004fc30c0 100644
--- a/docs/reference/commandline/export.md
+++ b/docs/reference/commandline/export.md
@@ -1,7 +1,7 @@
 ---
 title: "export"
 description: "The export command description and usage"
-keywords: ["export, file, system, container"]
+keywords: "export, file, system, container"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/history.md b/docs/reference/commandline/history.md
index 53762ce723..00f88db35b 100644
--- a/docs/reference/commandline/history.md
+++ b/docs/reference/commandline/history.md
@@ -1,7 +1,7 @@
 ---
 title: "history"
 description: "The history command description and usage"
-keywords: ["docker, image, history"]
+keywords: "docker, image, history"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/image_prune.md b/docs/reference/commandline/image_prune.md
index 5620bd6b5c..a80b8d38c8 100644
--- a/docs/reference/commandline/image_prune.md
+++ b/docs/reference/commandline/image_prune.md
@@ -1,7 +1,7 @@
 ---
 title: "image prune"
 description: "Remove all stopped images"
-keywords: [image, prune, delete, remove]
+keywords: "image, prune, delete, remove"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/images.md b/docs/reference/commandline/images.md
index 75dd1d6f19..e6d2da52d9 100644
--- a/docs/reference/commandline/images.md
+++ b/docs/reference/commandline/images.md
@@ -1,7 +1,7 @@
 ---
 title: "images"
 description: "The images command description and usage"
-keywords: ["list, docker, images"]
+keywords: "list, docker, images"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/import.md b/docs/reference/commandline/import.md
index 075fdd420d..20e90a61fd 100644
--- a/docs/reference/commandline/import.md
+++ b/docs/reference/commandline/import.md
@@ -1,7 +1,7 @@
 ---
 title: "import"
 description: "The import command description and usage"
-keywords: ["import, file, system, container"]
+keywords: "import, file, system, container"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/index.md b/docs/reference/commandline/index.md
index d65ecad1ee..3402f24190 100644
--- a/docs/reference/commandline/index.md
+++ b/docs/reference/commandline/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Docker commands"
 description: "Docker's CLI command description and usage"
-keywords: ["Docker, Docker documentation, CLI,  command line"]
+keywords: "Docker, Docker documentation, CLI, command line"
 identifier: "smn_cli_guide"
 ---
 
diff --git a/docs/reference/commandline/info.md b/docs/reference/commandline/info.md
index 2eb5edfc67..7a5833d7c2 100644
--- a/docs/reference/commandline/info.md
+++ b/docs/reference/commandline/info.md
@@ -1,7 +1,7 @@
 ---
 title: "info"
 description: "The info command description and usage"
-keywords: ["display, docker, information"]
+keywords: "display, docker, information"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/inspect.md b/docs/reference/commandline/inspect.md
index bb79dede16..7a0c3a0871 100644
--- a/docs/reference/commandline/inspect.md
+++ b/docs/reference/commandline/inspect.md
@@ -1,7 +1,7 @@
 ---
 title: "inspect"
 description: "The inspect command description and usage"
-keywords: ["inspect, container, json"]
+keywords: "inspect, container, json"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/kill.md b/docs/reference/commandline/kill.md
index 8ce6cc57f5..32fde3d8b5 100644
--- a/docs/reference/commandline/kill.md
+++ b/docs/reference/commandline/kill.md
@@ -1,7 +1,7 @@
 ---
 title: "kill"
 description: "The kill command description and usage"
-keywords: ["container, kill, signal"]
+keywords: "container, kill, signal"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/load.md b/docs/reference/commandline/load.md
index fac6f4ebf3..04a5bc7e56 100644
--- a/docs/reference/commandline/load.md
+++ b/docs/reference/commandline/load.md
@@ -1,7 +1,7 @@
 ---
 title: "load"
 description: "The load command description and usage"
-keywords: ["stdin, tarred, repository"]
+keywords: "stdin, tarred, repository"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/login.md b/docs/reference/commandline/login.md
index 160a11cb99..a0f35fd4d0 100644
--- a/docs/reference/commandline/login.md
+++ b/docs/reference/commandline/login.md
@@ -1,7 +1,7 @@
 ---
 title: "login"
 description: "The login command description and usage"
-keywords: ["registry, login, image"]
+keywords: "registry, login, image"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/logout.md b/docs/reference/commandline/logout.md
index 8ca8aa5bc8..1635e2244b 100644
--- a/docs/reference/commandline/logout.md
+++ b/docs/reference/commandline/logout.md
@@ -1,7 +1,7 @@
 ---
 title: "logout"
 description: "The logout command description and usage"
-keywords: ["logout, docker, registry"]
+keywords: "logout, docker, registry"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/logs.md b/docs/reference/commandline/logs.md
index 42088a3722..989460f160 100644
--- a/docs/reference/commandline/logs.md
+++ b/docs/reference/commandline/logs.md
@@ -1,7 +1,7 @@
 ---
 title: "logs"
 description: "The logs command description and usage"
-keywords: ["logs, retrieve, docker"]
+keywords: "logs, retrieve, docker"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/menu.md b/docs/reference/commandline/menu.md
index 99515ecbf8..d58afacd76 100644
--- a/docs/reference/commandline/menu.md
+++ b/docs/reference/commandline/menu.md
@@ -1,7 +1,7 @@
 ---
 title: "Command line reference"
 description: "Docker's CLI command description and usage"
-keywords: ["Docker, Docker documentation, CLI,  command line"]
+keywords: "Docker, Docker documentation, CLI, command line"
 identifier:  "smn_cli"
 ---
 
diff --git a/docs/reference/commandline/network_connect.md b/docs/reference/commandline/network_connect.md
index b4a79fc497..9748d249c8 100644
--- a/docs/reference/commandline/network_connect.md
+++ b/docs/reference/commandline/network_connect.md
@@ -1,7 +1,7 @@
 ---
 title: "network connect"
 description: "The network connect command description and usage"
-keywords: ["network, connect, user-defined"]
+keywords: "network, connect, user-defined"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/network_create.md b/docs/reference/commandline/network_create.md
index 4273207ea8..4673887242 100644
--- a/docs/reference/commandline/network_create.md
+++ b/docs/reference/commandline/network_create.md
@@ -1,7 +1,7 @@
 ---
 title: "network create"
 description: "The network create command description and usage"
-keywords: ["network, create"]
+keywords: "network, create"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/network_disconnect.md b/docs/reference/commandline/network_disconnect.md
index 1f6a00bf45..42e976a500 100644
--- a/docs/reference/commandline/network_disconnect.md
+++ b/docs/reference/commandline/network_disconnect.md
@@ -1,7 +1,7 @@
 ---
 title: "network disconnect"
 description: "The network disconnect command description and usage"
-keywords: ["network, disconnect, user-defined"]
+keywords: "network, disconnect, user-defined"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/network_inspect.md b/docs/reference/commandline/network_inspect.md
index 32754ddd7d..9f4a3203a5 100644
--- a/docs/reference/commandline/network_inspect.md
+++ b/docs/reference/commandline/network_inspect.md
@@ -1,7 +1,7 @@
 ---
 title: "network inspect"
 description: "The network inspect command description and usage"
-keywords: ["network, inspect, user-defined"]
+keywords: "network, inspect, user-defined"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/network_ls.md b/docs/reference/commandline/network_ls.md
index cf3bab6452..bd47da751a 100644
--- a/docs/reference/commandline/network_ls.md
+++ b/docs/reference/commandline/network_ls.md
@@ -1,7 +1,7 @@
 ---
 title: "network ls"
 description: "The network ls command description and usage"
-keywords: ["network, list, user-defined"]
+keywords: "network, list, user-defined"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/network_prune.md b/docs/reference/commandline/network_prune.md
index f0db94724a..5b65465600 100644
--- a/docs/reference/commandline/network_prune.md
+++ b/docs/reference/commandline/network_prune.md
@@ -1,7 +1,7 @@
 ---
 title: "network prune"
 description: "Remove unused networks"
-keywords: [network, prune, delete]
+keywords: "network, prune, delete"
 ---
 
 # network prune
diff --git a/docs/reference/commandline/network_rm.md b/docs/reference/commandline/network_rm.md
index d2bce4e0f0..f06b4c002d 100644
--- a/docs/reference/commandline/network_rm.md
+++ b/docs/reference/commandline/network_rm.md
@@ -1,7 +1,7 @@
 ---
 title: "network rm"
 description: "the network rm command description and usage"
-keywords: ["network, rm, user-defined"]
+keywords: "network, rm, user-defined"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/node_demote.md b/docs/reference/commandline/node_demote.md
index 462f0be22d..6885e62192 100644
--- a/docs/reference/commandline/node_demote.md
+++ b/docs/reference/commandline/node_demote.md
@@ -1,7 +1,7 @@
 ---
 title: "node demote"
 description: "The node demote command description and usage"
-keywords: ["node, demote"]
+keywords: "node, demote"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/node_inspect.md b/docs/reference/commandline/node_inspect.md
index 752951c6f5..3659814139 100644
--- a/docs/reference/commandline/node_inspect.md
+++ b/docs/reference/commandline/node_inspect.md
@@ -1,7 +1,7 @@
 ---
 title: "node inspect"
 description: "The node inspect command description and usage"
-keywords: ["node, inspect"]
+keywords: "node, inspect"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/node_ls.md b/docs/reference/commandline/node_ls.md
index 3bc78aaf9b..1bc9998f67 100644
--- a/docs/reference/commandline/node_ls.md
+++ b/docs/reference/commandline/node_ls.md
@@ -1,7 +1,7 @@
 ---
 title: "node ls"
 description: "The node ls command description and usage"
-keywords: ["node, list"]
+keywords: "node, list"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/node_promote.md b/docs/reference/commandline/node_promote.md
index 7e03069a3d..9771bbdffe 100644
--- a/docs/reference/commandline/node_promote.md
+++ b/docs/reference/commandline/node_promote.md
@@ -1,7 +1,7 @@
 ---
 title: "node promote"
 description: "The node promote command description and usage"
-keywords: ["node, promote"]
+keywords: "node, promote"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/node_rm.md b/docs/reference/commandline/node_rm.md
index c3046dbceb..1b1e4ba023 100644
--- a/docs/reference/commandline/node_rm.md
+++ b/docs/reference/commandline/node_rm.md
@@ -1,7 +1,7 @@
 ---
 title: "node rm"
 description: "The node rm command description and usage"
-keywords: ["node, remove"]
+keywords: "node, remove"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/node_update.md b/docs/reference/commandline/node_update.md
index 3be4c943f4..bb13e0b127 100644
--- a/docs/reference/commandline/node_update.md
+++ b/docs/reference/commandline/node_update.md
@@ -1,7 +1,7 @@
 ---
 title: "node update"
 description: "The node update command description and usage"
-keywords: ["resources, update, dynamically"]
+keywords: "resources, update, dynamically"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/pause.md b/docs/reference/commandline/pause.md
index 48c1e94dac..cc4794920d 100644
--- a/docs/reference/commandline/pause.md
+++ b/docs/reference/commandline/pause.md
@@ -1,7 +1,7 @@
 ---
 title: "pause"
 description: "The pause command description and usage"
-keywords: ["cgroups, container, suspend, SIGSTOP"]
+keywords: "cgroups, container, suspend, SIGSTOP"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/plugin_disable.md b/docs/reference/commandline/plugin_disable.md
index 7088952131..b08509363a 100644
--- a/docs/reference/commandline/plugin_disable.md
+++ b/docs/reference/commandline/plugin_disable.md
@@ -1,7 +1,7 @@
 ---
 title: "plugin disable"
 description: "the plugin disable command description and usage"
-keywords: ["plugin, disable"]
+keywords: "plugin, disable"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/plugin_enable.md b/docs/reference/commandline/plugin_enable.md
index 64b99b6ec3..f9635d9cec 100644
--- a/docs/reference/commandline/plugin_enable.md
+++ b/docs/reference/commandline/plugin_enable.md
@@ -1,7 +1,7 @@
 ---
 title: "plugin enable"
 description: "the plugin enable command description and usage"
-keywords: ["plugin, enable"]
+keywords: "plugin, enable"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/plugin_inspect.md b/docs/reference/commandline/plugin_inspect.md
index 6904d7a9cc..5aea7cce40 100755
--- a/docs/reference/commandline/plugin_inspect.md
+++ b/docs/reference/commandline/plugin_inspect.md
@@ -1,7 +1,7 @@
 ---
 title: "plugin inspect"
 description: "The plugin inspect command description and usage"
-keywords: ["plugin, inspect"]
+keywords: "plugin, inspect"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/plugin_install.md b/docs/reference/commandline/plugin_install.md
index 6378318bea..ce0ac17dff 100644
--- a/docs/reference/commandline/plugin_install.md
+++ b/docs/reference/commandline/plugin_install.md
@@ -1,7 +1,7 @@
 ---
 title: "plugin install"
 description: "the plugin install command description and usage"
-keywords: ["plugin, install"]
+keywords: "plugin, install"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/plugin_ls.md b/docs/reference/commandline/plugin_ls.md
index 8499008f31..baa0db7a53 100644
--- a/docs/reference/commandline/plugin_ls.md
+++ b/docs/reference/commandline/plugin_ls.md
@@ -1,7 +1,7 @@
 ---
 title: "plugin ls"
 description: "The plugin ls command description and usage"
-keywords: ["plugin, list"]
+keywords: "plugin, list"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/plugin_rm.md b/docs/reference/commandline/plugin_rm.md
index 684d15bfab..57dbfc9af1 100644
--- a/docs/reference/commandline/plugin_rm.md
+++ b/docs/reference/commandline/plugin_rm.md
@@ -1,7 +1,7 @@
 ---
 title: "plugin rm"
 description: "the plugin rm command description and usage"
-keywords: ["plugin, rm"]
+keywords: "plugin, rm"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/port.md b/docs/reference/commandline/port.md
index a4ec605885..bc90b6e786 100644
--- a/docs/reference/commandline/port.md
+++ b/docs/reference/commandline/port.md
@@ -1,7 +1,7 @@
 ---
 title: "port"
 description: "The port command description and usage"
-keywords: ["port, mapping, container"]
+keywords: "port, mapping, container"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/ps.md b/docs/reference/commandline/ps.md
index 6a7d6eaad4..1d5f31da88 100644
--- a/docs/reference/commandline/ps.md
+++ b/docs/reference/commandline/ps.md
@@ -1,7 +1,7 @@
 ---
 title: "ps"
 description: "The ps command description and usage"
-keywords: ["container, running, list"]
+keywords: "container, running, list"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/pull.md b/docs/reference/commandline/pull.md
index 0f3750d4ec..459d7d4950 100644
--- a/docs/reference/commandline/pull.md
+++ b/docs/reference/commandline/pull.md
@@ -1,7 +1,7 @@
 ---
 title: "pull"
 description: "The pull command description and usage"
-keywords: ["pull, image, hub, docker"]
+keywords: "pull, image, hub, docker"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/push.md b/docs/reference/commandline/push.md
index 3a5fd4b143..93230db6f9 100644
--- a/docs/reference/commandline/push.md
+++ b/docs/reference/commandline/push.md
@@ -1,7 +1,7 @@
 ---
 title: "push"
 description: "The push command description and usage"
-keywords: ["share, push, image"]
+keywords: "share, push, image"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/rename.md b/docs/reference/commandline/rename.md
index c3ebaa1f75..be035f1ce4 100644
--- a/docs/reference/commandline/rename.md
+++ b/docs/reference/commandline/rename.md
@@ -1,7 +1,7 @@
 ---
 title: "rename"
 description: "The rename command description and usage"
-keywords: ["rename, docker, container"]
+keywords: "rename, docker, container"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/restart.md b/docs/reference/commandline/restart.md
index fcc6d3f283..9f7ed00553 100644
--- a/docs/reference/commandline/restart.md
+++ b/docs/reference/commandline/restart.md
@@ -1,7 +1,7 @@
 ---
 title: "restart"
 description: "The restart command description and usage"
-keywords: ["restart, container, Docker"]
+keywords: "restart, container, Docker"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/rm.md b/docs/reference/commandline/rm.md
index 72abb9b931..1c3e795933 100644
--- a/docs/reference/commandline/rm.md
+++ b/docs/reference/commandline/rm.md
@@ -1,7 +1,7 @@
 ---
 title: "rm"
 description: "The rm command description and usage"
-keywords: ["remove, Docker, container"]
+keywords: "remove, Docker, container"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/rmi.md b/docs/reference/commandline/rmi.md
index dbd7c3078a..149b7635b6 100644
--- a/docs/reference/commandline/rmi.md
+++ b/docs/reference/commandline/rmi.md
@@ -1,7 +1,7 @@
 ---
 title: "rmi"
 description: "The rmi command description and usage"
-keywords: ["remove, image, Docker"]
+keywords: "remove, image, Docker"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/run.md b/docs/reference/commandline/run.md
index 49009b94b3..0c4a2688d8 100644
--- a/docs/reference/commandline/run.md
+++ b/docs/reference/commandline/run.md
@@ -1,7 +1,7 @@
 ---
 title: "run"
 description: "The run command description and usage"
-keywords: ["run, command, container"]
+keywords: "run, command, container"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/save.md b/docs/reference/commandline/save.md
index f7b2c57bd9..88a5fed103 100644
--- a/docs/reference/commandline/save.md
+++ b/docs/reference/commandline/save.md
@@ -1,7 +1,7 @@
 ---
 title: "save"
 description: "The save command description and usage"
-keywords: ["tarred, repository, backup"]
+keywords: "tarred, repository, backup"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/search.md b/docs/reference/commandline/search.md
index a67deb9fa7..5f419849ac 100644
--- a/docs/reference/commandline/search.md
+++ b/docs/reference/commandline/search.md
@@ -1,7 +1,7 @@
 ---
 title: "search"
 description: "The search command description and usage"
-keywords: ["search, hub, images"]
+keywords: "search, hub, images"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md
index b16f4c654f..fd0cb176a7 100644
--- a/docs/reference/commandline/service_create.md
+++ b/docs/reference/commandline/service_create.md
@@ -1,7 +1,7 @@
 ---
 title: "service create"
 description: "The service create command description and usage"
-keywords: ["service, create"]
+keywords: "service, create"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/service_inspect.md b/docs/reference/commandline/service_inspect.md
index 0407e19047..cf74f4f57d 100644
--- a/docs/reference/commandline/service_inspect.md
+++ b/docs/reference/commandline/service_inspect.md
@@ -1,7 +1,7 @@
 ---
 title: "service inspect"
 description: "The service inspect command description and usage"
-keywords: ["service, inspect"]
+keywords: "service, inspect"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/service_ls.md b/docs/reference/commandline/service_ls.md
index 909334dc3a..bcdafc91c6 100644
--- a/docs/reference/commandline/service_ls.md
+++ b/docs/reference/commandline/service_ls.md
@@ -1,7 +1,7 @@
 ---
 title: "service ls"
 description: "The service ls command description and usage"
-keywords: ["service, ls"]
+keywords: "service, ls"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/service_ps.md b/docs/reference/commandline/service_ps.md
index d1d14633ed..87c06cd762 100644
--- a/docs/reference/commandline/service_ps.md
+++ b/docs/reference/commandline/service_ps.md
@@ -1,7 +1,7 @@
 ---
 title: "service ps"
 description: "The service ps command description and usage"
-keywords: service, tasks, ps
+keywords: "service, tasks, ps"
 aliases: ["/engine/reference/commandline/service_tasks/"]
 ---
 
diff --git a/docs/reference/commandline/service_rm.md b/docs/reference/commandline/service_rm.md
index 43db9af7e6..363b0e3e5b 100644
--- a/docs/reference/commandline/service_rm.md
+++ b/docs/reference/commandline/service_rm.md
@@ -1,7 +1,7 @@
 ---
 title: "service rm"
 description: "The service rm command description and usage"
-keywords: ["service, rm"]
+keywords: "service, rm"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/service_scale.md b/docs/reference/commandline/service_scale.md
index 68dfa68c91..4440140363 100644
--- a/docs/reference/commandline/service_scale.md
+++ b/docs/reference/commandline/service_scale.md
@@ -1,7 +1,7 @@
 ---
 title: "service scale"
 description: "The service scale command description and usage"
-keywords: ["service, scale"]
+keywords: "service, scale"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/service_update.md b/docs/reference/commandline/service_update.md
index cf7dc9bdec..f938a9efc3 100644
--- a/docs/reference/commandline/service_update.md
+++ b/docs/reference/commandline/service_update.md
@@ -1,7 +1,7 @@
 ---
 title: "service update"
 description: "The service update command description and usage"
-keywords: ["service, update"]
+keywords: "service, update"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/stack_config.md b/docs/reference/commandline/stack_config.md
index 76a66cd144..d8d8bf2f74 100644
--- a/docs/reference/commandline/stack_config.md
+++ b/docs/reference/commandline/stack_config.md
@@ -1,7 +1,7 @@
 ---
 title: "stack config"
 description: "The stack config command description and usage"
-keywords: ["stack, config"]
+keywords: "stack, config"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/stack_deploy.md b/docs/reference/commandline/stack_deploy.md
index 384a1007fc..168f955681 100644
--- a/docs/reference/commandline/stack_deploy.md
+++ b/docs/reference/commandline/stack_deploy.md
@@ -1,7 +1,7 @@
 ---
 title: "stack deploy"
 description: "The stack deploy command description and usage"
-keywords: ["stack, deploy, up"]
+keywords: "stack, deploy, up"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/stack_ls.md b/docs/reference/commandline/stack_ls.md
index e9877ca4ec..f3668142ac 100644
--- a/docs/reference/commandline/stack_ls.md
+++ b/docs/reference/commandline/stack_ls.md
@@ -1,7 +1,7 @@
 ---
 title: "stack ls"
 description: "The stack ls command description and usage"
-keywords: ["stack, ls"]
+keywords: "stack, ls"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/stack_ps.md b/docs/reference/commandline/stack_ps.md
index 72a9c62160..ae1d15b5e1 100644
--- a/docs/reference/commandline/stack_ps.md
+++ b/docs/reference/commandline/stack_ps.md
@@ -1,7 +1,7 @@
 ---
 title: "stack ps"
 description: "The stack ps command description and usage"
-keywords: ["stack, ps"]
+keywords: "stack, ps"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/stack_rm.md b/docs/reference/commandline/stack_rm.md
index 66c5d4ad09..2e2a4166a2 100644
--- a/docs/reference/commandline/stack_rm.md
+++ b/docs/reference/commandline/stack_rm.md
@@ -1,7 +1,7 @@
 ---
 title: "stack rm"
 description: "The stack rm command description and usage"
-keywords: ["stack, rm, remove, down"]
+keywords: "stack, rm, remove, down"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/stack_services.md b/docs/reference/commandline/stack_services.md
index a820ac0cb2..0d809fb370 100644
--- a/docs/reference/commandline/stack_services.md
+++ b/docs/reference/commandline/stack_services.md
@@ -1,7 +1,7 @@
 ---
 title: "stack services"
 description: "The stack services command description and usage"
-keywords: ["stack, services"]
+keywords: "stack, services"
 advisory: "experimental"
 ---
 
diff --git a/docs/reference/commandline/start.md b/docs/reference/commandline/start.md
index a8e845d413..980bce9585 100644
--- a/docs/reference/commandline/start.md
+++ b/docs/reference/commandline/start.md
@@ -1,7 +1,7 @@
 ---
 title: "start"
 description: "The start command description and usage"
-keywords: ["Start, container, stopped"]
+keywords: "Start, container, stopped"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/stats.md b/docs/reference/commandline/stats.md
index f8eddd92bd..e97390317f 100644
--- a/docs/reference/commandline/stats.md
+++ b/docs/reference/commandline/stats.md
@@ -1,7 +1,7 @@
 ---
 title: "stats"
 description: "The stats command description and usage"
-keywords: ["container, resource, statistics"]
+keywords: "container, resource, statistics"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/stop.md b/docs/reference/commandline/stop.md
index e9dcff0e32..3090db98ae 100644
--- a/docs/reference/commandline/stop.md
+++ b/docs/reference/commandline/stop.md
@@ -1,7 +1,7 @@
 ---
 title: "stop"
 description: "The stop command description and usage"
-keywords: ["stop, SIGKILL, SIGTERM"]
+keywords: "stop, SIGKILL, SIGTERM"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/swarm_init.md b/docs/reference/commandline/swarm_init.md
index eb021fbe7b..bc1ce27ddb 100644
--- a/docs/reference/commandline/swarm_init.md
+++ b/docs/reference/commandline/swarm_init.md
@@ -1,7 +1,7 @@
 ---
 title: "swarm init"
 description: "The swarm init command description and usage"
-keywords: ["swarm, init"]
+keywords: "swarm, init"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/swarm_join.md b/docs/reference/commandline/swarm_join.md
index 78b3f3d784..9b7be1c553 100644
--- a/docs/reference/commandline/swarm_join.md
+++ b/docs/reference/commandline/swarm_join.md
@@ -1,7 +1,7 @@
 ---
 title: "swarm join"
 description: "The swarm join command description and usage"
-keywords: ["swarm, join"]
+keywords: "swarm, join"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/swarm_join_token.md b/docs/reference/commandline/swarm_join_token.md
index 65607c18e2..d731f028ba 100644
--- a/docs/reference/commandline/swarm_join_token.md
+++ b/docs/reference/commandline/swarm_join_token.md
@@ -1,7 +1,7 @@
 ---
 title: "swarm join-token"
 description: "The swarm join-token command description and usage"
-keywords: ["swarm, join-token"]
+keywords: "swarm, join-token"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/swarm_leave.md b/docs/reference/commandline/swarm_leave.md
index 1fbdf4b6a4..f0f31ee239 100644
--- a/docs/reference/commandline/swarm_leave.md
+++ b/docs/reference/commandline/swarm_leave.md
@@ -1,7 +1,7 @@
 ---
 title: "swarm leave"
 description: "The swarm leave command description and usage"
-keywords: ["swarm, leave"]
+keywords: "swarm, leave"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/swarm_update.md b/docs/reference/commandline/swarm_update.md
index 81c29c7798..7d49c83d36 100644
--- a/docs/reference/commandline/swarm_update.md
+++ b/docs/reference/commandline/swarm_update.md
@@ -1,7 +1,7 @@
 ---
 title: "swarm update"
 description: "The swarm update command description and usage"
-keywords: ["swarm, update"]
+keywords: "swarm, update"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/system_df.md b/docs/reference/commandline/system_df.md
index 10cd1b40a0..c6e8bbdc68 100644
--- a/docs/reference/commandline/system_df.md
+++ b/docs/reference/commandline/system_df.md
@@ -1,7 +1,7 @@
 ---
 title: "system df"
 description: "The system df command description and usage"
-keywords: [system, data, usage, disk]
+keywords: "system, data, usage, disk"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/system_prune.md b/docs/reference/commandline/system_prune.md
index 3f0c97478a..25a3d0a4bb 100644
--- a/docs/reference/commandline/system_prune.md
+++ b/docs/reference/commandline/system_prune.md
@@ -1,7 +1,7 @@
 ---
 title: "system prune"
 description: "Remove unused data"
-keywords: [system, prune, delete, remove]
+keywords: "system, prune, delete, remove"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/tag.md b/docs/reference/commandline/tag.md
index 75b7a51335..131d375193 100644
--- a/docs/reference/commandline/tag.md
+++ b/docs/reference/commandline/tag.md
@@ -1,7 +1,7 @@
 ---
 title: "tag"
 description: "The tag command description and usage"
-keywords: ["tag, name, image"]
+keywords: "tag, name, image"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/top.md b/docs/reference/commandline/top.md
index b47b421827..0a04828775 100644
--- a/docs/reference/commandline/top.md
+++ b/docs/reference/commandline/top.md
@@ -1,7 +1,7 @@
 ---
 title: "top"
 description: "The top command description and usage"
-keywords: ["container, running, processes"]
+keywords: "container, running, processes"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/unpause.md b/docs/reference/commandline/unpause.md
index 08c1aaf08a..17cc57e409 100644
--- a/docs/reference/commandline/unpause.md
+++ b/docs/reference/commandline/unpause.md
@@ -1,7 +1,7 @@
 ---
 title: "unpause"
 description: "The unpause command description and usage"
-keywords: ["cgroups, suspend, container"]
+keywords: "cgroups, suspend, container"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/update.md b/docs/reference/commandline/update.md
index 9ba7993bf7..a13900440f 100644
--- a/docs/reference/commandline/update.md
+++ b/docs/reference/commandline/update.md
@@ -1,7 +1,7 @@
 ---
 title: "update"
 description: "The update command description and usage"
-keywords: ["resources, update, dynamically"]
+keywords: "resources, update, dynamically"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/version.md b/docs/reference/commandline/version.md
index 494c3a208a..cb1bcee5b3 100644
--- a/docs/reference/commandline/version.md
+++ b/docs/reference/commandline/version.md
@@ -1,7 +1,7 @@
 ---
 title: "version"
 description: "The version command description and usage"
-keywords: ["version, architecture, api"]
+keywords: "version, architecture, api"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/volume_create.md b/docs/reference/commandline/volume_create.md
index 308430614d..9b188a9500 100644
--- a/docs/reference/commandline/volume_create.md
+++ b/docs/reference/commandline/volume_create.md
@@ -1,7 +1,7 @@
 ---
 title: "volume create"
 description: "The volume create command description and usage"
-keywords: ["volume, create"]
+keywords: "volume, create"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/volume_inspect.md b/docs/reference/commandline/volume_inspect.md
index d3a36f29ff..98e0ee5abf 100644
--- a/docs/reference/commandline/volume_inspect.md
+++ b/docs/reference/commandline/volume_inspect.md
@@ -1,7 +1,7 @@
 ---
 title: "volume inspect"
 description: "The volume inspect command description and usage"
-keywords: ["volume, inspect"]
+keywords: "volume, inspect"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/volume_ls.md b/docs/reference/commandline/volume_ls.md
index e7f531f30d..90ecef2abe 100644
--- a/docs/reference/commandline/volume_ls.md
+++ b/docs/reference/commandline/volume_ls.md
@@ -1,7 +1,7 @@
 ---
 title: "volume ls"
 description: "The volume ls command description and usage"
-keywords: ["volume, list"]
+keywords: "volume, list"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/volume_prune.md b/docs/reference/commandline/volume_prune.md
index e6866bf244..d910a49cdc 100644
--- a/docs/reference/commandline/volume_prune.md
+++ b/docs/reference/commandline/volume_prune.md
@@ -1,7 +1,7 @@
 ---
 title: "volume prune"
 description: "Remove unused volumes"
-keywords: [volume, prune, delete]
+keywords: "volume, prune, delete"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/volume_rm.md b/docs/reference/commandline/volume_rm.md
index e3526eaaac..1bf9dba220 100644
--- a/docs/reference/commandline/volume_rm.md
+++ b/docs/reference/commandline/volume_rm.md
@@ -1,7 +1,7 @@
 ---
 title: "volume rm"
 description: "the volume rm command description and usage"
-keywords: ["volume, rm"]
+keywords: "volume, rm"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/commandline/wait.md b/docs/reference/commandline/wait.md
index 68da5a43b0..a07b82b071 100644
--- a/docs/reference/commandline/wait.md
+++ b/docs/reference/commandline/wait.md
@@ -1,7 +1,7 @@
 ---
 title: "wait"
 description: "The wait command description and usage"
-keywords: ["container, stop, wait"]
+keywords: "container, stop, wait"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/glossary.md b/docs/reference/glossary.md
index 1644600739..5c3ef33f8a 100644
--- a/docs/reference/glossary.md
+++ b/docs/reference/glossary.md
@@ -1,7 +1,7 @@
 ---
 title: "Docker Glossary"
 description: "Glossary of terms used around Docker"
-keywords: ["glossary, docker, terms,  definitions"]
+keywords: "glossary, docker, terms, definitions"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/index.md b/docs/reference/index.md
index 24d1b673e4..01ac341617 100644
--- a/docs/reference/index.md
+++ b/docs/reference/index.md
@@ -1,7 +1,7 @@
 ---
 title: "Engine reference"
 description: "Docker Engine reference"
-keywords: ["Engine"]
+keywords: "Engine"
 ---
 
 <!-- This file is maintained within the docker/docker Github
diff --git a/docs/reference/run.md b/docs/reference/run.md
index f027d96fed..f513f82ca0 100644
--- a/docs/reference/run.md
+++ b/docs/reference/run.md
@@ -1,7 +1,7 @@
 ---
 title: "Docker run reference"
 description: "Configure containers at runtime"
-keywords: ["docker, run, configure,  runtime"]
+keywords: "docker, run, configure, runtime"
 ---
 
 <!-- This file is maintained within the docker/docker Github