beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #29696 from zhenghenghuo/branch-two

Browse source 
fix some typos
This commit is contained in:
Sebastiaan van Stijn 2016-12-28 08:05:43 +01:00 committed by GitHub
commit 38178cda41
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/vagrant-docker/README.md
View file

@ -35,7 +35,7 @@ script
end script end script
``` ```
Once that's done, you need to set up a SSH tunnel between your host machine and the vagrant machine that's running Docker. This can be done by running the following command in a host terminal: Once that's done, you need to set up an SSH tunnel between your host machine and the vagrant machine that's running Docker. This can be done by running the following command in a host terminal:
``` ```
ssh -L 2375:localhost:2375 -p 2222 vagrant@localhost ssh -L 2375:localhost:2375 -p 2222 vagrant@localhost

4
docs/extend/plugins_volume.md
View file

@ -169,7 +169,7 @@ Docker needs reminding of the path to the volume on the host.
Respond with the path on the host filesystem where the volume has been made Respond with the path on the host filesystem where the volume has been made
available, and/or a string error if an error occurred. `Mountpoint` is optional, available, and/or a string error if an error occurred. `Mountpoint` is optional,
however the plugin may be queried again later if one is not provided. however, the plugin may be queried again later if one is not provided.
### /VolumeDriver.Unmount ### /VolumeDriver.Unmount
@ -257,7 +257,7 @@ Respond with a string error if an error occurred. `Mountpoint` is optional.
``` ```
Get the list of capabilities the driver supports. Get the list of capabilities the driver supports.
The driver is not required to implement this endpoint, however in such cases The driver is not required to implement this endpoint, however, in such cases
the default values will be taken. the default values will be taken.
**Response**: **Response**:

4
docs/reference/commandline/dockerd.md
View file

@ -237,7 +237,7 @@ drivers: `aufs`, `devicemapper`, `btrfs`, `zfs`, `overlay` and `overlay2`.
The `aufs` driver is the oldest, but is based on a Linux kernel patch-set that The `aufs` driver is the oldest, but is based on a Linux kernel patch-set that
is unlikely to be merged into the main kernel. These are also known to cause is unlikely to be merged into the main kernel. These are also known to cause
some serious kernel crashes. However, `aufs` allows containers to share some serious kernel crashes. However `aufs` allows containers to share
executable and shared library memory, so is a useful choice when running executable and shared library memory, so is a useful choice when running
thousands of containers with the same program or libraries. thousands of containers with the same program or libraries.
@ -658,7 +658,7 @@ options for `zfs` start with `zfs` and options for `btrfs` start with `btrfs`.
Overrides the Linux kernel version check allowing overlay2. Support for Overrides the Linux kernel version check allowing overlay2. Support for
specifying multiple lower directories needed by overlay2 was added to the specifying multiple lower directories needed by overlay2 was added to the
Linux kernel in 4.0.0. However some older kernel versions may be patched Linux kernel in 4.0.0. However, some older kernel versions may be patched
to add multiple lower directory support for OverlayFS. This option should to add multiple lower directory support for OverlayFS. This option should
only be used after verifying this support exists in the kernel. Applying only be used after verifying this support exists in the kernel. Applying
this option on a kernel without this support will cause failures on mount. this option on a kernel without this support will cause failures on mount.

2
experimental/vlan-networks.md
View file

@ -166,7 +166,7 @@ $ ip route
Example: Multi-Subnet Ipvlan L2 Mode starting two containers on the same subnet and pinging one another. In order for the `192.168.114.0/24` to reach `192.168.116.0/24` it requires an external router in L2 mode. L3 mode can route between subnets that share a common `-o parent=`. Example: Multi-Subnet Ipvlan L2 Mode starting two containers on the same subnet and pinging one another. In order for the `192.168.114.0/24` to reach `192.168.116.0/24` it requires an external router in L2 mode. L3 mode can route between subnets that share a common `-o parent=`.
Secondary addresses on network routers are common as an address space becomes exhausted to add another secondary to a L3 vlan interface or commonly referred to as a "switched virtual interface" (SVI). Secondary addresses on network routers are common as an address space becomes exhausted to add another secondary to an L3 vlan interface or commonly referred to as a "switched virtual interface" (SVI).
``` ```
docker network create -d ipvlan \ docker network create -d ipvlan \

2
pkg/locker/README.md
View file

@ -4,7 +4,7 @@ Locker
locker provides a mechanism for creating finer-grained locking to help locker provides a mechanism for creating finer-grained locking to help
free up more global locks to handle other tasks. free up more global locks to handle other tasks.
The implementation looks close to a sync.Mutex, however the user must provide a The implementation looks close to a sync.Mutex, however, the user must provide a
reference to use to refer to the underlying lock when locking and unlocking, reference to use to refer to the underlying lock when locking and unlocking,
and unlock may generate an error. and unlock may generate an error.