Browse Source

Merge pull request #5215 from danmcp/fix_typos

Fixing typos
Victor Vieux 11 years ago
parent
commit
ef114930cd
2 changed files with 2 additions and 2 deletions
  1. 1 1
      runtime/networkdriver/bridge/driver.go
  2. 1 1
      server/server.go

+ 1 - 1
runtime/networkdriver/bridge/driver.go

@@ -32,7 +32,7 @@ var (
 		// This is to use the same gateway IPs as the /24 ranges, which predate the /16 ranges.
 		// In theory this shouldn't matter - in practice there's bound to be a few scripts relying
 		// on the internal addressing or other stupid things like that.
-		// The shouldn't, but hey, let's not break them unless we really have to.
+		// They shouldn't, but hey, let's not break them unless we really have to.
 		"172.17.42.1/16", // Don't use 172.16.0.0/16, it conflicts with EC2 DNS 172.16.0.23
 		"10.0.42.1/16",   // Don't even try using the entire /8, that's too intrusive
 		"10.1.42.1/16",

+ 1 - 1
server/server.go

@@ -1287,7 +1287,7 @@ func (srv *Server) pullRepository(r *registry.Registry, out io.Writer, localName
 			for _, ep := range repoData.Endpoints {
 				out.Write(sf.FormatProgress(utils.TruncateID(img.ID), fmt.Sprintf("Pulling image (%s) from %s, endpoint: %s", img.Tag, localName, ep), nil))
 				if err := srv.pullImage(r, out, img.ID, ep, repoData.Tokens, sf); err != nil {
-					// Its not ideal that only the last error  is returned, it would be better to concatenate the errors.
+					// It's not ideal that only the last error is returned, it would be better to concatenate the errors.
 					// As the error is also given to the output stream the user will see the error.
 					lastErr = err
 					out.Write(sf.FormatProgress(utils.TruncateID(img.ID), fmt.Sprintf("Error pulling image (%s) from %s, endpoint: %s, %s", img.Tag, localName, ep, err), nil))