Prechádzať zdrojové kódy

Merge pull request #14245 from gs11/master

Clarifications in usage
Sebastiaan van Stijn 10 rokov pred
rodič
commit
2d61de4625
1 zmenil súbory, kde vykonal 1 pridanie a 1 odobranie
  1. 1 1
      daemon/daemon.go

+ 1 - 1
daemon/daemon.go

@@ -396,7 +396,7 @@ func (daemon *Daemon) reserveName(id, name string) (string, error) {
 		} else {
 		} else {
 			nameAsKnownByUser := strings.TrimPrefix(name, "/")
 			nameAsKnownByUser := strings.TrimPrefix(name, "/")
 			return "", fmt.Errorf(
 			return "", fmt.Errorf(
-				"Conflict. The name %q is already in use by container %s. You have to delete (or rename) that container to be able to reuse that name.", nameAsKnownByUser,
+				"Conflict. The name %q is already in use by container %s. You have to remove (or rename) that container to be able to reuse that name.", nameAsKnownByUser,
 				stringid.TruncateID(conflictingContainer.ID))
 				stringid.TruncateID(conflictingContainer.ID))
 		}
 		}
 	}
 	}