diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker
index 602a9ab2ce..5a97bb6844 100644
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@@ -1600,7 +1600,7 @@ _docker_service_inspect() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help --pretty -p" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--format -f --help --pretty" -- "$cur" ) )
 			;;
 		*)
 			__docker_complete_services
@@ -1689,7 +1689,7 @@ _docker_service_tasks() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--all -a --filter -f --help --no-resolve -n" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--all -a --filter -f --help --no-resolve" -- "$cur" ) )
 			;;
 		*)
 			local counter=$(__docker_pos_first_nonflag '--filter|-f')
@@ -1710,7 +1710,7 @@ _docker_service_update() {
 		--label -l
 		--limit-cpu
 		--limit-memory
-		--mount -m
+		--mount
 		--name
 		--network
 		--publish -p
@@ -1956,7 +1956,7 @@ _docker_node_inspect() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help --pretty -p" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--format -f --help --pretty" -- "$cur" ) )
 			;;
 		*)
 			__docker_complete_nodes
@@ -2042,7 +2042,7 @@ _docker_node_tasks() {
 
 	case "$cur" in
 		-*)
-			COMPREPLY=( $( compgen -W "--all -a --filter -f --help --no-resolve -n" -- "$cur" ) )
+			COMPREPLY=( $( compgen -W "--all -a --filter -f --help --no-resolve" -- "$cur" ) )
 			;;
 		*)
 			local counter=$(__docker_pos_first_nonflag '--filter|-f')
diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker
index 1f687d8805..a328401171 100644
--- a/contrib/completion/zsh/_docker
+++ b/contrib/completion/zsh/_docker
@@ -808,7 +808,7 @@ __docker_node_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help -p --pretty)"{-p,--pretty}"[Print the information in a human friendly format]" \
+                "($help --pretty)--pretty[Print the information in a human friendly format]" \
                 "($help -)*:node:__docker_complete_nodes" && ret=0
             ;;
         (ls|list)
@@ -832,7 +832,7 @@ __docker_node_subcommand() {
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Display all instances]" \
                 "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
-                "($help -n --no-resolve)"{-n,--no-resolve}"[Do not map IDs to Names]" \
+                "($help --no-resolve)--no-resolve[Do not map IDs to Names]" \
                 "($help -)1:node:__docker_complete_nodes" && ret=0
             case $state in
                 (filter-options)
@@ -1072,7 +1072,7 @@ __docker_service_subcommand() {
         "($help)--limit-cpu=[Limit CPUs]:value: "
         "($help)--limit-memory=[Limit Memory]:value: "
         "($help)--mode=[Limit Memory]:mode:(global replicated)"
-        "($help)*"{-m=,--mount=}"[Attach a mount to the service]:mount: "
+        "($help)*--mount=[Attach a mount to the service]:mount: "
         "($help)--name=[Service name]:name: "
         "($help)*--network=[Network attachments]:network: "
         "($help)*"{-p=,--publish=}"[Publish a port as a node port]:port: "
@@ -1103,7 +1103,7 @@ __docker_service_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help -p --pretty)"{-p,--pretty}"[Print the information in a human friendly format]" \
+                "($help --pretty)--pretty[Print the information in a human friendly format]" \
                 "($help -)*:service:__docker_complete_services" && ret=0
             ;;
         (ls|list)
@@ -1141,7 +1141,7 @@ __docker_service_subcommand() {
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Display all tasks]" \
                 "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
-                "($help -n --no-resolve)"{-n,--no-resolve}"[Do not map IDs to Names]" \
+                "($help --no-resolve)--no-resolve[Do not map IDs to Names]" \
                 "($help -)1:service:__docker_complete_services" && ret=0
             case $state in
                 (filter-options)
diff --git a/docs/reference/commandline/node_inspect.md b/docs/reference/commandline/node_inspect.md
index 982fbec6b6..a565bb3af0 100644
--- a/docs/reference/commandline/node_inspect.md
+++ b/docs/reference/commandline/node_inspect.md
@@ -19,7 +19,7 @@ Display detailed information on one or more nodes
 Options:
   -f, --format string   Format the output using the given go template
       --help            Print usage
-  -p, --pretty          Print the information in a human friendly format.
+      --pretty          Print the information in a human friendly format.
 ```
 
 Returns information about a node. By default, this command renders all results
diff --git a/docs/reference/commandline/node_tasks.md b/docs/reference/commandline/node_tasks.md
index a5bd175269..6da8002ff4 100644
--- a/docs/reference/commandline/node_tasks.md
+++ b/docs/reference/commandline/node_tasks.md
@@ -20,7 +20,7 @@ Options:
   -a, --all            Display all instances
   -f, --filter value   Filter output based on conditions provided
       --help           Print usage
-  -n, --no-resolve     Do not map IDs to Names
+      --no-resolve     Do not map IDs to Names
 ```
 
 Lists all the tasks on a Node that 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.
diff --git a/docs/reference/commandline/service_create.md b/docs/reference/commandline/service_create.md
index 99d4e7ddc2..e69cc2e660 100644
--- a/docs/reference/commandline/service_create.md
+++ b/docs/reference/commandline/service_create.md
@@ -25,7 +25,7 @@ Options:
       --limit-cpu value              Limit CPUs (default 0.000)
       --limit-memory value           Limit Memory (default 0 B)
       --mode string                  Service mode (replicated or global) (default "replicated")
-  -m, --mount value                  Attach a mount to the service
+      --mount value                  Attach a mount to the service
       --name string                  Service name
       --network value                Network attachments (default [])
   -p, --publish value                Publish a port as a node port (default [])
diff --git a/docs/reference/commandline/service_inspect.md b/docs/reference/commandline/service_inspect.md
index a010a4c088..dbd083018b 100644
--- a/docs/reference/commandline/service_inspect.md
+++ b/docs/reference/commandline/service_inspect.md
@@ -19,7 +19,7 @@ Display detailed information on one or more services
 Options:
   -f, --format string   Format the output using the given go template
       --help            Print usage
-  -p, --pretty          Print the information in a human friendly format.
+      --pretty          Print the information in a human friendly format.
 ```
 
 
diff --git a/docs/reference/commandline/service_tasks.md b/docs/reference/commandline/service_tasks.md
index 5e3154c4d0..51524bc69d 100644
--- a/docs/reference/commandline/service_tasks.md
+++ b/docs/reference/commandline/service_tasks.md
@@ -20,7 +20,7 @@ Options:
   -a, --all            Display all tasks
   -f, --filter value   Filter output based on conditions provided
       --help           Print usage
-  -n, --no-resolve     Do not map IDs to Names
+      --no-resolve     Do not map IDs to Names
 ```
 
 Lists the tasks that are running as part of the specified service. This command
diff --git a/docs/reference/commandline/service_update.md b/docs/reference/commandline/service_update.md
index 1db62063fc..5e76fd0d7a 100644
--- a/docs/reference/commandline/service_update.md
+++ b/docs/reference/commandline/service_update.md
@@ -26,7 +26,7 @@ Options:
   -l, --label value                  Service labels (default [])
       --limit-cpu value              Limit CPUs (default 0.000)
       --limit-memory value           Limit Memory (default 0 B)
-  -m, --mount value                  Attach a mount to the service
+      --mount value                  Attach a mount to the service
       --name string                  Service name
       --network value                Network attachments (default [])
   -p, --publish value                Publish a port as a node port (default [])