diff --git a/docs/reference/commandline/events.md b/docs/reference/commandline/events.md
index c9821814de..cb34eee497 100644
--- a/docs/reference/commandline/events.md
+++ b/docs/reference/commandline/events.md
@@ -13,7 +13,7 @@ Get real time events from the server
 
 Options:
   -f, --filter value   Filter output based on conditions provided (default [])
-      --format string  Format the output using the given go template
+      --format string  Format the output using the given Go template
       --help           Print usage
       --since string   Show all events created since timestamp
       --until string   Stream events until this timestamp
diff --git a/docs/reference/commandline/info.md b/docs/reference/commandline/info.md
index a880fb7556..12c54d7a32 100644
--- a/docs/reference/commandline/info.md
+++ b/docs/reference/commandline/info.md
@@ -12,7 +12,7 @@ Usage:  docker info [OPTIONS]
 Display system-wide information
 
 Options:
-  -f, --format string   Format the output using the given go template
+  -f, --format string   Format the output using the given Go template
       --help            Print usage
 ```
 
diff --git a/docs/reference/commandline/inspect.md b/docs/reference/commandline/inspect.md
index 697254a07a..ec61d96cc3 100644
--- a/docs/reference/commandline/inspect.md
+++ b/docs/reference/commandline/inspect.md
@@ -13,7 +13,7 @@ Return low-level information on one or multiple containers, images, volumes,
 networks, nodes, services, or tasks identified by name or ID.
 
 Options:
-  -f, --format       Format the output using the given go template
+  -f, --format       Format the output using the given Go template
       --help         Print usage
   -s, --size         Display total file sizes if the type is container
                      values are "image" or "container" or "task
diff --git a/docs/reference/commandline/network_inspect.md b/docs/reference/commandline/network_inspect.md
index 1e0b3e53dd..9603d936dd 100644
--- a/docs/reference/commandline/network_inspect.md
+++ b/docs/reference/commandline/network_inspect.md
@@ -12,7 +12,7 @@ Usage:  docker network inspect [OPTIONS] NETWORK [NETWORK...]
 Display detailed information on one or more networks
 
 Options:
-  -f, --format string   Format the output using the given go template
+  -f, --format string   Format the output using the given Go template
       --help            Print usage
 ```
 
diff --git a/docs/reference/commandline/node_inspect.md b/docs/reference/commandline/node_inspect.md
index 9edc081f3b..8728605f2a 100644
--- a/docs/reference/commandline/node_inspect.md
+++ b/docs/reference/commandline/node_inspect.md
@@ -12,7 +12,7 @@ Usage:  docker node inspect [OPTIONS] self|NODE [NODE...]
 Display detailed information on one or more nodes
 
 Options:
-  -f, --format string   Format the output using the given go template
+  -f, --format string   Format the output using the given Go template
       --help            Print usage
       --pretty          Print the information in a human friendly format.
 ```
diff --git a/docs/reference/commandline/plugin_inspect.md b/docs/reference/commandline/plugin_inspect.md
index 01f5877e8c..e0b566be99 100755
--- a/docs/reference/commandline/plugin_inspect.md
+++ b/docs/reference/commandline/plugin_inspect.md
@@ -13,7 +13,7 @@ Usage:  docker plugin inspect [OPTIONS] PLUGIN [PLUGIN...]
 Display detailed information on one or more plugins
 
 Options:
-      -f, --format string   Format the output using the given go template
+      -f, --format string   Format the output using the given Go template
           --help            Print usage
 ```
 
diff --git a/docs/reference/commandline/service_inspect.md b/docs/reference/commandline/service_inspect.md
index fc167d77a8..29286dd7d5 100644
--- a/docs/reference/commandline/service_inspect.md
+++ b/docs/reference/commandline/service_inspect.md
@@ -12,7 +12,7 @@ Usage:  docker service inspect [OPTIONS] SERVICE [SERVICE...]
 Display detailed information on one or more services
 
 Options:
-  -f, --format string   Format the output using the given go template
+  -f, --format string   Format the output using the given Go template
       --help            Print usage
       --pretty          Print the information in a human friendly format.
 ```
diff --git a/docs/reference/commandline/system_prune.md b/docs/reference/commandline/system_prune.md
index 6df4b21e0c..cdea0c642f 100644
--- a/docs/reference/commandline/system_prune.md
+++ b/docs/reference/commandline/system_prune.md
@@ -60,6 +60,7 @@ Total reclaimed space: 13.5 MB
 * [volume ls](volume_ls.md)
 * [volume inspect](volume_inspect.md)
 * [volume rm](volume_rm.md)
+* [volume prune](volume_prune.md)
 * [Understand Data Volumes](../../tutorials/dockervolumes.md)
 * [system df](system_df.md)
 * [container prune](container_prune.md)
diff --git a/docs/reference/commandline/version.md b/docs/reference/commandline/version.md
index ee95e6508a..169d077e10 100644
--- a/docs/reference/commandline/version.md
+++ b/docs/reference/commandline/version.md
@@ -12,7 +12,7 @@ Usage:  docker version [OPTIONS]
 Show the Docker version information
 
 Options:
-  -f, --format string   Format the output using the given go template
+  -f, --format string   Format the output using the given Go template
       --help            Print usage
 ```
 
diff --git a/docs/reference/commandline/volume_create.md b/docs/reference/commandline/volume_create.md
index b05b408736..db9d7a28ce 100644
--- a/docs/reference/commandline/volume_create.md
+++ b/docs/reference/commandline/volume_create.md
@@ -78,4 +78,5 @@ $ docker volume create --driver local --opt type=nfs --opt o=addr=192.168.1.1,rw
 * [volume inspect](volume_inspect.md)
 * [volume ls](volume_ls.md)
 * [volume rm](volume_rm.md)
+* [volume prune](volume_prune.md)
 * [Understand Data Volumes](../../tutorials/dockervolumes.md)
diff --git a/docs/reference/commandline/volume_inspect.md b/docs/reference/commandline/volume_inspect.md
index dd748d2706..fba4853178 100644
--- a/docs/reference/commandline/volume_inspect.md
+++ b/docs/reference/commandline/volume_inspect.md
@@ -12,7 +12,7 @@ Usage:  docker volume inspect [OPTIONS] VOLUME [VOLUME...]
 Display detailed information on one or more volumes
 
 Options:
-  -f, --format string   Format the output using the given go template
+  -f, --format string   Format the output using the given Go template
       --help            Print usage
 ```
 
@@ -44,4 +44,5 @@ Example output:
 * [volume create](volume_create.md)
 * [volume ls](volume_ls.md)
 * [volume rm](volume_rm.md)
+* [volume prune](volume_prune.md)
 * [Understand Data Volumes](../../tutorials/dockervolumes.md)
diff --git a/docs/reference/commandline/volume_ls.md b/docs/reference/commandline/volume_ls.md
index fb8c658261..d9dde580d1 100644
--- a/docs/reference/commandline/volume_ls.md
+++ b/docs/reference/commandline/volume_ls.md
@@ -25,7 +25,7 @@ Options:
   -q, --quiet          Only display volume names
 ```
 
-Lists all the volumes Docker knows about. You can filter using the `-f` or `--filter` flag. Refer to the [filtering](#filtering) section for more information about available filter options.
+List all the volumes Docker knows about. You can filter using the `-f` or `--filter` flag. Refer to the [filtering](#filtering) section for more information about available filter options.
 
 Example output:
 
@@ -170,4 +170,5 @@ vol3: local
 * [volume create](volume_create.md)
 * [volume inspect](volume_inspect.md)
 * [volume rm](volume_rm.md)
+* [volume prune](volume_prune.md)
 * [Understand Data Volumes](../../tutorials/dockervolumes.md)
diff --git a/docs/reference/commandline/volume_rm.md b/docs/reference/commandline/volume_rm.md
index 2e5e534309..ec54400778 100644
--- a/docs/reference/commandline/volume_rm.md
+++ b/docs/reference/commandline/volume_rm.md
@@ -30,4 +30,5 @@ Remove one or more volumes. You cannot remove a volume that is in use by a conta
 * [volume create](volume_create.md)
 * [volume inspect](volume_inspect.md)
 * [volume ls](volume_ls.md)
+* [volume prune](volume_prune.md)
 * [Understand Data Volumes](../../tutorials/dockervolumes.md)
diff --git a/man/docker-events.1.md b/man/docker-events.1.md
index 311020f6ef..11b3e98e5a 100644
--- a/man/docker-events.1.md
+++ b/man/docker-events.1.md
@@ -47,7 +47,7 @@ Docker networks report the following events:
    Stream events until this timestamp
 
 **--format**=""
-   Format the output using the given go template
+   Format the output using the given Go template
 
 The `--since` and `--until` parameters can be Unix timestamps, date formatted
 timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
diff --git a/man/docker-info.1.md b/man/docker-info.1.md
index 810b215363..42f1efe863 100644
--- a/man/docker-info.1.md
+++ b/man/docker-info.1.md
@@ -33,7 +33,7 @@ available on the volume where `/var/lib/docker` is mounted.
   Print usage statement
 
 **-f**, **--format**=""
-  Format the output using the given go template
+  Format the output using the given Go template
 
 # EXAMPLES
 
diff --git a/man/docker-network-inspect.1.md b/man/docker-network-inspect.1.md
index 3805fb25a8..f27c98cb34 100644
--- a/man/docker-network-inspect.1.md
+++ b/man/docker-network-inspect.1.md
@@ -103,7 +103,7 @@ $ docker network inspect simple-network
 
 # OPTIONS
 **-f**, **--format**=""
-  Format the output using the given go template.
+  Format the output using the given Go template.
 
 **--help**
   Print usage statement
diff --git a/man/docker-version.1.md b/man/docker-version.1.md
index 04ae3464f8..bb521c4eed 100644
--- a/man/docker-version.1.md
+++ b/man/docker-version.1.md
@@ -18,7 +18,7 @@ daemon.
     Print usage statement
 
 **-f**, **--format**=""
-    Format the output using the given go template.
+    Format the output using the given Go template.
 
 # EXAMPLES