Merge pull request #26770 from YuPengZTE/devEG

'eg.' should be 'e.g.'

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

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##*/}"

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
 #

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
 #