浏览代码

Merge pull request #29244 from yuexiao-wang/fix-typos-eg

Fix a bit typos
Akihiro Suda 8 年之前
父节点
当前提交
d1515a5264

+ 1 - 1
api/common_windows.go

@@ -3,6 +3,6 @@ package api
 // MinVersion represents Minimum REST API version supported
 // Technically the first daemon API version released on Windows is v1.25 in
 // engine version 1.13. However, some clients are explicitly using downlevel
-// APIs (eg docker-compose v2.1 file format) and that is just too restrictive.
+// APIs (e.g. docker-compose v2.1 file format) and that is just too restrictive.
 // Hence also allowing 1.24 on Windows.
 const MinVersion string = "1.24"

+ 1 - 1
api/types/container/host_config.go

@@ -317,7 +317,7 @@ type HostConfig struct {
 
 	// Applicable to Windows
 	ConsoleSize [2]uint   // Initial console size (height,width)
-	Isolation   Isolation // Isolation technology of the container (eg default, hyperv)
+	Isolation   Isolation // Isolation technology of the container (e.g. default, hyperv)
 
 	// Contains container's resources (cgroups, ulimits)
 	Resources

+ 1 - 1
container/container.go

@@ -229,7 +229,7 @@ func (container *Container) SetupWorkingDirectory(rootUID, rootGID int) error {
 
 	container.Config.WorkingDir = filepath.Clean(container.Config.WorkingDir)
 
-	// If can't mount container FS at this point (eg Hyper-V Containers on
+	// If can't mount container FS at this point (e.g. Hyper-V Containers on
 	// Windows) bail out now with no action.
 	if !container.canMountFS() {
 		return nil

+ 1 - 1
integration-cli/docker_utils.go

@@ -80,7 +80,7 @@ func init() {
 		containerStoragePath = strings.Replace(containerStoragePath, `/`, `\`, -1)
 		// On Windows, extract out the version as we need to make selective
 		// decisions during integration testing as and when features are implemented.
-		// eg in "10.0 10550 (10550.1000.amd64fre.branch.date-time)" we want 10550
+		// e.g. in "10.0 10550 (10550.1000.amd64fre.branch.date-time)" we want 10550
 		windowsDaemonKV, _ = strconv.Atoi(strings.Split(info.KernelVersion, " ")[1])
 	} else {
 		volumesConfigPath = strings.Replace(volumesConfigPath, `\`, `/`, -1)

+ 1 - 1
pkg/archive/archive.go

@@ -661,7 +661,7 @@ func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error)
 				if skip {
 					// If we want to skip this file and its a directory
 					// then we should first check to see if there's an
-					// excludes pattern (eg !dir/file) that starts with this
+					// excludes pattern (e.g. !dir/file) that starts with this
 					// dir. If so then we can't skip this dir.
 
 					// Its not a dir then so we can just return/skip.

+ 1 - 1
pkg/httputils/httputils.go

@@ -42,7 +42,7 @@ type ServerHeader struct {
 }
 
 // ParseServerHeader extracts pieces from an HTTP server header
-// which is in the format "docker/version (os)" eg docker/1.8.0-dev (windows).
+// which is in the format "docker/version (os)" e.g. docker/1.8.0-dev (windows).
 func ParseServerHeader(hdr string) (*ServerHeader, error) {
 	matches := headerRegexp.FindStringSubmatch(hdr)
 	if len(matches) != 4 {

+ 1 - 1
plugin/store/store.go

@@ -21,7 +21,7 @@ const allowV1PluginsFallback bool = true
 
 /* defaultAPIVersion is the version of the plugin API for volume, network,
    IPAM and authz. This is a very stable API. When we update this API, then
-   pluginType should include a version. eg "networkdriver/2.0".
+   pluginType should include a version. e.g. "networkdriver/2.0".
 */
 const defaultAPIVersion string = "1.0"
 

+ 1 - 1
runconfig/opts/parse_test.go

@@ -336,7 +336,7 @@ func compareRandomizedStrings(a, b, c, d string) error {
 // setupPlatformVolume takes two arrays of volume specs - a Unix style
 // spec and a Windows style spec. Depending on the platform being unit tested,
 // it returns one of them, along with a volume string that would be passed
-// on the docker CLI (eg -v /bar -v /foo).
+// on the docker CLI (e.g. -v /bar -v /foo).
 func setupPlatformVolume(u []string, w []string) ([]string, string) {
 	var a []string
 	if runtime.GOOS == "windows" {

+ 1 - 1
volume/volume.go

@@ -216,7 +216,7 @@ func ParseMountRaw(raw, volumeDriver string) (*MountPoint, error) {
 	case 2:
 		if ValidMountMode(arr[1]) {
 			// Destination + Mode is not a valid volume - volumes
-			// cannot include a mode. eg /foo:rw
+			// cannot include a mode. e.g. /foo:rw
 			return nil, errInvalidSpec(raw)
 		}
 		// Host Source Path or Name + Destination