summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuPengZTE <yu.peng36@zte.com.cn>2016-09-21 13:48:06 +0800
committerYuPengZTE <yu.peng36@zte.com.cn>2016-09-21 13:48:06 +0800
commit0b86bca0b5c627ebb9524ecf5295c2c91e4bd8f5 (patch)
tree11f8fe59deb5bbb4c559b9881b45cc51b1cfaf7d
parent2cce7bf33a1af566670ec0fb2deeff8056b2798d (diff)
downloaddocker-0b86bca0b5c627ebb9524ecf5295c2c91e4bd8f5.tar.gz
'eg.' should be 'e.g.'
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
-rw-r--r--api/types/container/config.go2
-rw-r--r--hack/make/.detect-daemon-osarch2
-rw-r--r--hack/make/.integration-test-helpers2
-rw-r--r--hack/make/test-unit2
4 files changed, 4 insertions, 4 deletions
diff --git a/api/types/container/config.go b/api/types/container/config.go
index e72b065b4b..1145d5a413 100644
--- a/api/types/container/config.go
+++ b/api/types/container/config.go
@@ -48,7 +48,7 @@ type Config struct {
Cmd strslice.StrSlice // Command to run when starting the container
Healthcheck *HealthConfig `json:",omitempty"` // Healthcheck describes how to check the container is healthy
ArgsEscaped bool `json:",omitempty"` // True if command is already escaped (Windows specific)
- Image string // Name of the image as it was passed by the operator (eg. could be symbolic)
+ Image string // Name of the image as it was passed by the operator (e.g. could be symbolic)
Volumes map[string]struct{} // List of volumes (mounts) used for the container
WorkingDir string // Current directory (PWD) in the command will be launched
Entrypoint strslice.StrSlice // Entrypoint to run when starting the container
diff --git a/hack/make/.detect-daemon-osarch b/hack/make/.detect-daemon-osarch
index 571e802eb9..420b49968c 100644
--- a/hack/make/.detect-daemon-osarch
+++ b/hack/make/.detect-daemon-osarch
@@ -18,7 +18,7 @@ docker-version-osarch() {
'
}
-# Retrieve OS/ARCH of docker daemon, eg. linux/amd64
+# Retrieve OS/ARCH of docker daemon, e.g. linux/amd64
export DOCKER_ENGINE_OSARCH="$(docker-version-osarch 'Server')"
export DOCKER_ENGINE_GOOS="${DOCKER_ENGINE_OSARCH%/*}"
export DOCKER_ENGINE_GOARCH="${DOCKER_ENGINE_OSARCH##*/}"
diff --git a/hack/make/.integration-test-helpers b/hack/make/.integration-test-helpers
index 47b9384b69..7b73b2f140 100644
--- a/hack/make/.integration-test-helpers
+++ b/hack/make/.integration-test-helpers
@@ -8,7 +8,7 @@ bundle_test_integration_cli() {
}
# If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'.
-# You can use this to select certain tests to run, eg.
+# You can use this to select certain tests to run, e.g.
#
# TESTFLAGS='-test.run ^TestBuild$' ./hack/make.sh test-unit
#
diff --git a/hack/make/test-unit b/hack/make/test-unit
index 24b79bd374..482edaf426 100644
--- a/hack/make/test-unit
+++ b/hack/make/test-unit
@@ -3,7 +3,7 @@ set -e
# Run Docker's test suite, including sub-packages, and store their output as a bundle
# If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'.
-# You can use this to select certain tests to run, eg.
+# You can use this to select certain tests to run, e.g.
#
# TESTFLAGS='-test.run ^TestBuild$' ./hack/make.sh test-unit
#