mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	Merge pull request #27476 from yuexiao-wang/fix-typos-volume
Fix some typos
This commit is contained in:
		
						commit
						1feaeac65c
					
				
					 28 changed files with 30 additions and 25 deletions
				
			
		| 
						 | 
					@ -30,7 +30,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	flags := cmd.Flags()
 | 
						flags := cmd.Flags()
 | 
				
			||||||
	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")
 | 
						flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
 | 
				
			||||||
	flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes")
 | 
						flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return cmd
 | 
						return cmd
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,7 +29,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	flags := cmd.Flags()
 | 
						flags := cmd.Flags()
 | 
				
			||||||
	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")
 | 
						flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
 | 
				
			||||||
	return cmd
 | 
						return cmd
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -27,7 +27,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")
 | 
						cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return cmd
 | 
						return cmd
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -36,7 +36,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	flags := cmd.Flags()
 | 
						flags := cmd.Flags()
 | 
				
			||||||
	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")
 | 
						flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
 | 
				
			||||||
	flags.BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format.")
 | 
						flags.BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format.")
 | 
				
			||||||
	return cmd
 | 
						return cmd
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,7 +32,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	flags := cmd.Flags()
 | 
						flags := cmd.Flags()
 | 
				
			||||||
	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")
 | 
						flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
 | 
				
			||||||
	return cmd
 | 
						return cmd
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -37,7 +37,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	flags := cmd.Flags()
 | 
						flags := cmd.Flags()
 | 
				
			||||||
	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")
 | 
						flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
 | 
				
			||||||
	flags.BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format.")
 | 
						flags.BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format.")
 | 
				
			||||||
	return cmd
 | 
						return cmd
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -45,7 +45,7 @@ func NewEventsCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
	flags.StringVar(&opts.since, "since", "", "Show all events created since timestamp")
 | 
						flags.StringVar(&opts.since, "since", "", "Show all events created since timestamp")
 | 
				
			||||||
	flags.StringVar(&opts.until, "until", "", "Stream events until this timestamp")
 | 
						flags.StringVar(&opts.until, "until", "", "Stream events until this timestamp")
 | 
				
			||||||
	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
 | 
						flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
 | 
				
			||||||
	flags.StringVar(&opts.format, "format", "", "Format the output using the given go template")
 | 
						flags.StringVar(&opts.format, "format", "", "Format the output using the given Go template")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return cmd
 | 
						return cmd
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -37,7 +37,7 @@ func NewInfoCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	flags := cmd.Flags()
 | 
						flags := cmd.Flags()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")
 | 
						flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return cmd
 | 
						return cmd
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -35,7 +35,7 @@ func NewInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	flags := cmd.Flags()
 | 
						flags := cmd.Flags()
 | 
				
			||||||
	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")
 | 
						flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
 | 
				
			||||||
	flags.StringVar(&opts.inspectType, "type", "", "Return JSON for specified type")
 | 
						flags.StringVar(&opts.inspectType, "type", "", "Return JSON for specified type")
 | 
				
			||||||
	flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes if the type is container")
 | 
						flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes if the type is container")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -52,7 +52,7 @@ func NewVersionCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	flags := cmd.Flags()
 | 
						flags := cmd.Flags()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")
 | 
						flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return cmd
 | 
						return cmd
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -28,7 +28,7 @@ func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given go template")
 | 
						cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return cmd
 | 
						return cmd
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,7 +13,7 @@ Get real time events from the server
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Options:
 | 
					Options:
 | 
				
			||||||
  -f, --filter value   Filter output based on conditions provided (default [])
 | 
					  -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
 | 
					      --help           Print usage
 | 
				
			||||||
      --since string   Show all events created since timestamp
 | 
					      --since string   Show all events created since timestamp
 | 
				
			||||||
      --until string   Stream events until this timestamp
 | 
					      --until string   Stream events until this timestamp
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@ Usage:  docker info [OPTIONS]
 | 
				
			||||||
Display system-wide information
 | 
					Display system-wide information
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Options:
 | 
					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
 | 
					      --help            Print usage
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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.
 | 
					networks, nodes, services, or tasks identified by name or ID.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Options:
 | 
					Options:
 | 
				
			||||||
  -f, --format       Format the output using the given go template
 | 
					  -f, --format       Format the output using the given Go template
 | 
				
			||||||
      --help         Print usage
 | 
					      --help         Print usage
 | 
				
			||||||
  -s, --size         Display total file sizes if the type is container
 | 
					  -s, --size         Display total file sizes if the type is container
 | 
				
			||||||
                     values are "image" or "container" or "task
 | 
					                     values are "image" or "container" or "task
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@ Usage:  docker network inspect [OPTIONS] NETWORK [NETWORK...]
 | 
				
			||||||
Display detailed information on one or more networks
 | 
					Display detailed information on one or more networks
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Options:
 | 
					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
 | 
					      --help            Print usage
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@ Usage:  docker node inspect [OPTIONS] self|NODE [NODE...]
 | 
				
			||||||
Display detailed information on one or more nodes
 | 
					Display detailed information on one or more nodes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Options:
 | 
					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
 | 
					      --help            Print usage
 | 
				
			||||||
      --pretty          Print the information in a human friendly format.
 | 
					      --pretty          Print the information in a human friendly format.
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -13,7 +13,7 @@ Usage:  docker plugin inspect [OPTIONS] PLUGIN [PLUGIN...]
 | 
				
			||||||
Display detailed information on one or more plugins
 | 
					Display detailed information on one or more plugins
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Options:
 | 
					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
 | 
					          --help            Print usage
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@ Usage:  docker service inspect [OPTIONS] SERVICE [SERVICE...]
 | 
				
			||||||
Display detailed information on one or more services
 | 
					Display detailed information on one or more services
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Options:
 | 
					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
 | 
					      --help            Print usage
 | 
				
			||||||
      --pretty          Print the information in a human friendly format.
 | 
					      --pretty          Print the information in a human friendly format.
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -60,6 +60,7 @@ Total reclaimed space: 13.5 MB
 | 
				
			||||||
* [volume ls](volume_ls.md)
 | 
					* [volume ls](volume_ls.md)
 | 
				
			||||||
* [volume inspect](volume_inspect.md)
 | 
					* [volume inspect](volume_inspect.md)
 | 
				
			||||||
* [volume rm](volume_rm.md)
 | 
					* [volume rm](volume_rm.md)
 | 
				
			||||||
 | 
					* [volume prune](volume_prune.md)
 | 
				
			||||||
* [Understand Data Volumes](../../tutorials/dockervolumes.md)
 | 
					* [Understand Data Volumes](../../tutorials/dockervolumes.md)
 | 
				
			||||||
* [system df](system_df.md)
 | 
					* [system df](system_df.md)
 | 
				
			||||||
* [container prune](container_prune.md)
 | 
					* [container prune](container_prune.md)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@ Usage:  docker version [OPTIONS]
 | 
				
			||||||
Show the Docker version information
 | 
					Show the Docker version information
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Options:
 | 
					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
 | 
					      --help            Print usage
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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 inspect](volume_inspect.md)
 | 
				
			||||||
* [volume ls](volume_ls.md)
 | 
					* [volume ls](volume_ls.md)
 | 
				
			||||||
* [volume rm](volume_rm.md)
 | 
					* [volume rm](volume_rm.md)
 | 
				
			||||||
 | 
					* [volume prune](volume_prune.md)
 | 
				
			||||||
* [Understand Data Volumes](../../tutorials/dockervolumes.md)
 | 
					* [Understand Data Volumes](../../tutorials/dockervolumes.md)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -12,7 +12,7 @@ Usage:  docker volume inspect [OPTIONS] VOLUME [VOLUME...]
 | 
				
			||||||
Display detailed information on one or more volumes
 | 
					Display detailed information on one or more volumes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Options:
 | 
					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
 | 
					      --help            Print usage
 | 
				
			||||||
```
 | 
					```
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -44,4 +44,5 @@ Example output:
 | 
				
			||||||
* [volume create](volume_create.md)
 | 
					* [volume create](volume_create.md)
 | 
				
			||||||
* [volume ls](volume_ls.md)
 | 
					* [volume ls](volume_ls.md)
 | 
				
			||||||
* [volume rm](volume_rm.md)
 | 
					* [volume rm](volume_rm.md)
 | 
				
			||||||
 | 
					* [volume prune](volume_prune.md)
 | 
				
			||||||
* [Understand Data Volumes](../../tutorials/dockervolumes.md)
 | 
					* [Understand Data Volumes](../../tutorials/dockervolumes.md)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,7 +25,7 @@ Options:
 | 
				
			||||||
  -q, --quiet          Only display volume names
 | 
					  -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:
 | 
					Example output:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -170,4 +170,5 @@ vol3: local
 | 
				
			||||||
* [volume create](volume_create.md)
 | 
					* [volume create](volume_create.md)
 | 
				
			||||||
* [volume inspect](volume_inspect.md)
 | 
					* [volume inspect](volume_inspect.md)
 | 
				
			||||||
* [volume rm](volume_rm.md)
 | 
					* [volume rm](volume_rm.md)
 | 
				
			||||||
 | 
					* [volume prune](volume_prune.md)
 | 
				
			||||||
* [Understand Data Volumes](../../tutorials/dockervolumes.md)
 | 
					* [Understand Data Volumes](../../tutorials/dockervolumes.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 create](volume_create.md)
 | 
				
			||||||
* [volume inspect](volume_inspect.md)
 | 
					* [volume inspect](volume_inspect.md)
 | 
				
			||||||
* [volume ls](volume_ls.md)
 | 
					* [volume ls](volume_ls.md)
 | 
				
			||||||
 | 
					* [volume prune](volume_prune.md)
 | 
				
			||||||
* [Understand Data Volumes](../../tutorials/dockervolumes.md)
 | 
					* [Understand Data Volumes](../../tutorials/dockervolumes.md)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -47,7 +47,7 @@ Docker networks report the following events:
 | 
				
			||||||
   Stream events until this timestamp
 | 
					   Stream events until this timestamp
 | 
				
			||||||
 | 
					
 | 
				
			||||||
**--format**=""
 | 
					**--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
 | 
					The `--since` and `--until` parameters can be Unix timestamps, date formatted
 | 
				
			||||||
timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
 | 
					timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -33,7 +33,7 @@ available on the volume where `/var/lib/docker` is mounted.
 | 
				
			||||||
  Print usage statement
 | 
					  Print usage statement
 | 
				
			||||||
 | 
					
 | 
				
			||||||
**-f**, **--format**=""
 | 
					**-f**, **--format**=""
 | 
				
			||||||
  Format the output using the given go template
 | 
					  Format the output using the given Go template
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# EXAMPLES
 | 
					# EXAMPLES
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -103,7 +103,7 @@ $ docker network inspect simple-network
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# OPTIONS
 | 
					# OPTIONS
 | 
				
			||||||
**-f**, **--format**=""
 | 
					**-f**, **--format**=""
 | 
				
			||||||
  Format the output using the given go template.
 | 
					  Format the output using the given Go template.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
**--help**
 | 
					**--help**
 | 
				
			||||||
  Print usage statement
 | 
					  Print usage statement
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -18,7 +18,7 @@ daemon.
 | 
				
			||||||
    Print usage statement
 | 
					    Print usage statement
 | 
				
			||||||
 | 
					
 | 
				
			||||||
**-f**, **--format**=""
 | 
					**-f**, **--format**=""
 | 
				
			||||||
    Format the output using the given go template.
 | 
					    Format the output using the given Go template.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# EXAMPLES
 | 
					# EXAMPLES
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue