mirror of https://github.com/docker/docs.git
				
				
				
			fix some typos
Signed-off-by: bin liu <liubin0329@gmail.com> (cherry picked from commit 950073aabb305db6156709ea8509b1f72ff06f3b)
This commit is contained in:
		
							parent
							
								
									62d50a3f13
								
							
						
					
					
						commit
						6a5a150722
					
				|  | @ -15,7 +15,7 @@ type diffOptions struct { | |||
| 	container string | ||||
| } | ||||
| 
 | ||||
| // NewDiffCommand creats a new cobra.Command for `docker diff`
 | ||||
| // NewDiffCommand creates a new cobra.Command for `docker diff`
 | ||||
| func NewDiffCommand(dockerCli *client.DockerCli) *cobra.Command { | ||||
| 	var opts diffOptions | ||||
| 
 | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ type restartOptions struct { | |||
| 	containers []string | ||||
| } | ||||
| 
 | ||||
| // NewRestartCommand creats a new cobra.Command for `docker restart`
 | ||||
| // NewRestartCommand creates a new cobra.Command for `docker restart`
 | ||||
| func NewRestartCommand(dockerCli *client.DockerCli) *cobra.Command { | ||||
| 	var opts restartOptions | ||||
| 
 | ||||
|  |  | |||
|  | @ -20,7 +20,7 @@ type rmOptions struct { | |||
| 	containers []string | ||||
| } | ||||
| 
 | ||||
| // NewRmCommand creats a new cobra.Command for `docker rm`
 | ||||
| // NewRmCommand creates a new cobra.Command for `docker rm`
 | ||||
| func NewRmCommand(dockerCli *client.DockerCli) *cobra.Command { | ||||
| 	var opts rmOptions | ||||
| 
 | ||||
|  |  | |||
|  | @ -18,7 +18,7 @@ type topOptions struct { | |||
| 	args []string | ||||
| } | ||||
| 
 | ||||
| // NewTopCommand creats a new cobra.Command for `docker top`
 | ||||
| // NewTopCommand creates a new cobra.Command for `docker top`
 | ||||
| func NewTopCommand(dockerCli *client.DockerCli) *cobra.Command { | ||||
| 	var opts topOptions | ||||
| 
 | ||||
|  |  | |||
|  | @ -15,7 +15,7 @@ type waitOptions struct { | |||
| 	containers []string | ||||
| } | ||||
| 
 | ||||
| // NewWaitCommand creats a new cobra.Command for `docker wait`
 | ||||
| // NewWaitCommand creates a new cobra.Command for `docker wait`
 | ||||
| func NewWaitCommand(dockerCli *client.DockerCli) *cobra.Command { | ||||
| 	var opts waitOptions | ||||
| 
 | ||||
|  |  | |||
|  | @ -110,7 +110,7 @@ func (cli *DockerCli) ConfigureAuth(flUser, flPassword, serverAddress string, is | |||
| 
 | ||||
| 	if flUser = strings.TrimSpace(flUser); flUser == "" { | ||||
| 		if isDefaultRegistry { | ||||
| 			// if this is a defauly registry (docker hub), then display the following message.
 | ||||
| 			// if this is a default registry (docker hub), then display the following message.
 | ||||
| 			fmt.Fprintln(cli.out, "Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.") | ||||
| 		} | ||||
| 		cli.promptWithDefault("Username", authconfig.Username) | ||||
|  |  | |||
|  | @ -163,7 +163,7 @@ func (c *containerAdapter) inspect(ctx context.Context) (types.ContainerJSON, er | |||
| // events issues a call to the events API and returns a channel with all
 | ||||
| // events. The stream of events can be shutdown by cancelling the context.
 | ||||
| //
 | ||||
| // A chan struct{} is returned that will be closed if the event procressing
 | ||||
| // A chan struct{} is returned that will be closed if the event processing
 | ||||
| // fails and needs to be restarted.
 | ||||
| func (c *containerAdapter) wait(ctx context.Context) error { | ||||
| 	return c.backend.ContainerWaitWithContext(ctx, c.container.name()) | ||||
|  |  | |||
|  | @ -25,7 +25,7 @@ weight = 1 | |||
| 
 | ||||
| ### Docker for Mac | ||||
| 
 | ||||
| Docker for Mac is our newest offering for the Mac. It runs as a native Mac application and uses <a href="https://github.com/mist64/xhyve/" target="_blank">xhyve</a> to virutalize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. | ||||
| Docker for Mac is our newest offering for the Mac. It runs as a native Mac application and uses <a href="https://github.com/mist64/xhyve/" target="_blank">xhyve</a> to virtualize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. | ||||
| 
 | ||||
| <a class="button" href="https://download.docker.com/mac/beta/Docker.dmg">Get Docker for Mac</a> | ||||
| 
 | ||||
|  | @ -47,7 +47,7 @@ See [Docker Toolbox Overview](/toolbox/overview.md) for help on installing Docke | |||
| 
 | ||||
| ### Docker for Windows | ||||
| 
 | ||||
| Docker for Windows is our newest offering for PCs. It runs as a native Windows application and uses Hyper-V to virutalize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. | ||||
| Docker for Windows is our newest offering for PCs. It runs as a native Windows application and uses Hyper-V to virtualize the Docker Engine environment and Linux kernel-specific features for the Docker daemon. | ||||
| 
 | ||||
| <a class="button" href="https://download.docker.com/win/beta/InstallDocker.msi">Get Docker for Windows</a> | ||||
| 
 | ||||
|  |  | |||
|  | @ -126,7 +126,7 @@ To generate your access token: | |||
|         default          -        virtualbox     Running   tcp://192.168.99.100:2376    | ||||
|         docker-sandbox   *        digitalocean   Running   tcp://45.55.222.72:2376      | ||||
| 
 | ||||
| 6. Run some `docker-machine` commands to inspect the remote host. For example, `docker-machine ip <machine>` gets the host IP adddress and `docker-machine inspect <machine>` lists all the details. | ||||
| 6. Run some `docker-machine` commands to inspect the remote host. For example, `docker-machine ip <machine>` gets the host IP address and `docker-machine inspect <machine>` lists all the details. | ||||
| 
 | ||||
|         $ docker-machine ip docker-sandbox | ||||
|         104.131.43.236 | ||||
|  |  | |||
|  | @ -28,7 +28,7 @@ run your manager node. For example, the tutorial uses a machine named | |||
|     helloworld | ||||
|     ``` | ||||
| 
 | ||||
| 3. Run `docker service inspect <SERVICE-ID>` to veriy that the swarm manager | ||||
| 3. Run `docker service inspect <SERVICE-ID>` to verify that the swarm manager | ||||
| removed the service. The CLI returns a message that the service is not found: | ||||
| 
 | ||||
|     ``` | ||||
|  |  | |||
|  | @ -51,7 +51,7 @@ var ( | |||
| 	// greater than the 125 max.
 | ||||
| 	ErrMaxDepthExceeded = errors.New("max depth exceeded") | ||||
| 
 | ||||
| 	// ErrNotSupported is used when the action is not supppoted
 | ||||
| 	// ErrNotSupported is used when the action is not supported
 | ||||
| 	// on the current platform
 | ||||
| 	ErrNotSupported = errors.New("not support on this platform") | ||||
| ) | ||||
|  |  | |||
|  | @ -100,7 +100,7 @@ const ( | |||
| ) | ||||
| 
 | ||||
| const ( | ||||
| 	// AUFSWhiteoutFormat is the default format for whitesouts
 | ||||
| 	// AUFSWhiteoutFormat is the default format for whiteouts
 | ||||
| 	AUFSWhiteoutFormat WhiteoutFormat = iota | ||||
| 	// OverlayWhiteoutFormat formats whiteout according to the overlay
 | ||||
| 	// standard.
 | ||||
|  |  | |||
|  | @ -65,7 +65,7 @@ func (rm *restartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped | |||
| 	if rm.active { | ||||
| 		return false, nil, fmt.Errorf("invalid call on active restartmanager") | ||||
| 	} | ||||
| 	// if the container ran for more than 10s, reguardless of status and policy reset the
 | ||||
| 	// if the container ran for more than 10s, regardless of status and policy reset the
 | ||||
| 	// the timeout back to the default.
 | ||||
| 	if executionDuration.Seconds() >= 10 { | ||||
| 		rm.timeout = 0 | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue