@@ -15305,7 +15305,7 @@

      },

      "cancelled": {

       "type": "boolean",

-      "description": "describes if a canceling event was triggered for the build"

+      "description": "describes if a cancel event was triggered for the build"

      },

      "reason": {

       "type": "string",

@@ -70,7 +70,7 @@ type BuildStatus struct {

 	// Phase is the point in the build lifecycle.

 	Phase BuildPhase

-	// Cancelled describes if a cancelling event was triggered for the build.

+	// Cancelled describes if a cancel event was triggered for the build.

 	Cancelled bool

 	// Reason is a brief CamelCase string that describes any failure and is meant for machine parsing and tidy display in the CLI.

@@ -54,8 +54,8 @@ type BuildStatus struct {

 	// Phase is the point in the build lifecycle.

 	Phase BuildPhase `json:"phase" description:"observed point in the build lifecycle"`

-	// Cancelled describes if a cancelling event was triggered for the build.

-	Cancelled bool `json:"cancelled,omitempty" description:"describes if a canceling event was triggered for the build"`

+	// Cancelled describes if a cancel event was triggered for the build.

+	Cancelled bool `json:"cancelled,omitempty" description:"describes if a cancel event was triggered for the build"`

 	// Reason is a brief CamelCase string that describes any failure and is meant for machine parsing and tidy display in the CLI.

 	Reason StatusReason `json:"reason,omitempty" description:"brief CamelCase string describing a failure, meant for machine parsing and tidy display in the CLI"`

@@ -54,7 +54,7 @@ type BuildStatus struct {

 	// Phase is the point in the build lifecycle.

 	Phase BuildPhase `json:"phase"`

-	// Cancelled describes if a cancelling event was triggered for the build.

+	// Cancelled describes if a cancel event was triggered for the build.

 	Cancelled bool `json:"cancelled,omitempty"`

 	// Reason is a brief CamelCase string that describes any failure and is meant for machine parsing and tidy display in the CLI.

@@ -75,7 +75,7 @@ func (bc *BuildController) CancelBuild(build *buildapi.Build) error {

 	return nil

 }

-// HandleBuild deletes pods for canceled builds and takes new builds and puts

+// HandleBuild deletes pods for cancelled builds and takes new builds and puts

 // them in the pending state after creating a corresponding pod

 func (bc *BuildController) HandleBuild(build *buildapi.Build) error {

 	glog.V(4).Infof("Handling build %s/%s", build.Namespace, build.Name)

@@ -111,10 +111,10 @@ func NewCmdPruneBuilds(f *clientcmd.Factory, parentName, name string, out io.Wri

 	}

 	cmd.Flags().BoolVar(&cfg.Confirm, "confirm", cfg.Confirm, "Specify that build pruning should proceed. Defaults to false, displaying what would be deleted but not actually deleting anything.")

-	cmd.Flags().BoolVar(&cfg.Orphans, "orphans", cfg.Orphans, "Prune all builds whose associated BuildConfig no longer exists and whose status is complete, failed, error, or canceled.")

+	cmd.Flags().BoolVar(&cfg.Orphans, "orphans", cfg.Orphans, "Prune all builds whose associated BuildConfig no longer exists and whose status is complete, failed, error, or cancelled.")

 	cmd.Flags().DurationVar(&cfg.KeepYoungerThan, "keep-younger-than", cfg.KeepYoungerThan, "Specify the minimum age of a Build for it to be considered a candidate for pruning.")

 	cmd.Flags().IntVar(&cfg.KeepComplete, "keep-complete", cfg.KeepComplete, "Per BuildConfig, specify the number of builds whose status is complete that will be preserved.")

-	cmd.Flags().IntVar(&cfg.KeepFailed, "keep-failed", cfg.KeepFailed, "Per BuildConfig, specify the number of builds whose status is failed, error, or canceled that will be preserved.")

+	cmd.Flags().IntVar(&cfg.KeepFailed, "keep-failed", cfg.KeepFailed, "Per BuildConfig, specify the number of builds whose status is failed, error, or cancelled that will be preserved.")

 	return cmd

 }

@@ -154,7 +154,7 @@ func describeBuildDuration(build *buildapi.Build) string {

 		(build.Status.Phase == buildapi.BuildPhaseCancelled ||

 			build.Status.Phase == buildapi.BuildPhaseFailed ||

 			build.Status.Phase == buildapi.BuildPhaseError) {

-		// time a build waited for its pod before ultimately being canceled before that pod was created

+		// time a build waited for its pod before ultimately being cancelled before that pod was created

 		return fmt.Sprintf("waited for %s", build.Status.CompletionTimestamp.Rfc3339Copy().Time.Sub(build.CreationTimestamp.Rfc3339Copy().Time))

 	} else if build.Status.StartTimestamp == nil && build.Status.Phase != buildapi.BuildPhaseCancelled {

 		// time a new build has been waiting for its pod to be created so it can run

@@ -34,7 +34,7 @@ func retryWhenUnreachable(t *testing.T, f func() error) error {

 		//   Get https://registry.com/v2/: dial tcp: lookup registry.com: no such host

 		//   Get https://registry.com/v2/: dial tcp registry.com:443: getsockopt: connection refused

 		//   Get https://registry.com/v2/: read tcp 127.0.0.1:39849->registry.com:443: read: connection reset by peer

-		//   Get https://registry.com/v2/: net/http: request canceled while waiting for connection

+		//   Get https://registry.com/v2/: net/http: request cancelled while waiting for connection

 		//   Get https://registry.com/v2/: net/http: TLS handshake timeout

 		//   the registry "https://registry.com/v2/ " could not be reached

 		reachable := true